diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index c4cbd3e8..014cfb03 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -1,9 +1,16 @@ menu "Additional drivers, libraries and/or applications" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/baresip/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/btspeaker/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/clog/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/cpuinfo/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/docbook-xml/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/docbook-xsl/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/fann/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/farmhash/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/fft2d/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/fp16/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/fxdiv/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/gemmlowp/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/growdisk-service/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/hostname-service/Config.in" menu "KDE Framework and Plasma" @@ -86,13 +93,17 @@ endmenu source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/librem/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/lottie-qml/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ncpamixer/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/neon2sse/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ovos-dashboard/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ovos-shell/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ovos-splash/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/picotts/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/psimd/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/pthreadpool/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/qt5ct/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/respeaker/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/rpi-eeprom/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ruy/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/snapcast/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/spotifyd/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/tensorflow-lite/Config.in" @@ -102,6 +113,8 @@ endmenu source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/whispercpp/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/wifi-connect/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/wiringpi2/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/xnnpack/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/xorgproto-mesafix/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/xvf3510/Config.in" endmenu menu "Additional external python modules" diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index e471bc24..e34994ff 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -284,8 +284,6 @@ BR2_PACKAGE_SQUASHFS_LZO=y BR2_PACKAGE_SQUASHFS_XZ=y BR2_PACKAGE_DEJAVU=y BR2_PACKAGE_LIBERATION=y -BR2_PACKAGE_GLMARK2=y -BR2_PACKAGE_FBGRAB=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y BR2_PACKAGE_MESA3D_OPENGL_ES=y @@ -357,6 +355,7 @@ BR2_PACKAGE_PYTHON_ARROW=y BR2_PACKAGE_PYTHON_AUTOBAHN=y BR2_PACKAGE_PYTHON_CHERRYPY=y BR2_PACKAGE_PYTHON_COLORAMA=y +BR2_PACKAGE_PYTHON_COLORZERO=y BR2_PACKAGE_PYTHON_CONFIGSHELL_FB=y BR2_PACKAGE_PYTHON_DAEMONIZE=y BR2_PACKAGE_PYTHON_DBUS_NEXT=y @@ -367,7 +366,6 @@ BR2_PACKAGE_PYTHON_FLASK_JSONRPC=y BR2_PACKAGE_PYTHON_FLASK_LOGIN=y BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY=y BR2_PACKAGE_PYTHON_FLATBUFFERS=y -BR2_PACKAGE_PYTHON_GPIOZERO=y BR2_PACKAGE_PYTHON_HUMANIZE=y BR2_PACKAGE_PYTHON_JSON_SCHEMA_VALIDATOR=y BR2_PACKAGE_PYTHON_JSONMODELS=y @@ -384,6 +382,7 @@ BR2_PACKAGE_PYTHON_PIP=y BR2_PACKAGE_PYTHON_PSUTIL=y BR2_PACKAGE_PYTHON_PYJWT=y BR2_PACKAGE_PYTHON_PYUDEV=y +BR2_PACKAGE_PYTHON_RPI_GPIO=y BR2_PACKAGE_PYTHON_RPI_WS281X=y BR2_PACKAGE_PYTHON_SDNOTIFY=y BR2_PACKAGE_PYTHON_SERIAL=y @@ -454,7 +453,6 @@ BR2_PACKAGE_LIBSHAIRPLAY=y BR2_PACKAGE_NGHTTP2=y BR2_PACKAGE_BOOST_SYSTEM=y BR2_PACKAGE_ELL=y -BR2_PACKAGE_FLATBUFFERS=y BR2_PACKAGE_GTEST=y BR2_PACKAGE_LIBCAP_NG=y BR2_PACKAGE_LIBUV=y @@ -604,7 +602,7 @@ BR2_PACKAGE_VOCALFUSION=y BR2_PACKAGE_WHISPERCPP=y BR2_PACKAGE_WIFI_CONNECT=y BR2_PACKAGE_WIRINGPI2=y -BR2_PACKAGE_PYTHON_ADAFRUIT_BLINKA=y +BR2_PACKAGE_XORGPROTO_MESAFIX=y BR2_PACKAGE_PYTHON_ADAPT_PARSER=y BR2_PACKAGE_PYTHON_ASTRAL=y BR2_PACKAGE_PYTHON_AUDIO_METADATA=y @@ -659,6 +657,7 @@ BR2_PACKAGE_PYTHON_PYAUDIO=y BR2_PACKAGE_PYTHON_PYCHROMECAST=y BR2_PACKAGE_PYTHON_PYCPUINFO=y BR2_PACKAGE_PYTHON_PYEE=y +BR2_PACKAGE_PYTHON_PYFTDI=y BR2_PACKAGE_PYTHON_PYJOKES=y BR2_PACKAGE_PYTHON_PYMPLAYER=y BR2_PACKAGE_PYTHON_PYOWM=y diff --git a/buildroot-external/package/clog/Config.in b/buildroot-external/package/clog/Config.in new file mode 100644 index 00000000..865358bf --- /dev/null +++ b/buildroot-external/package/clog/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_CLOG + bool "clog" + help + C-style library for logging errors, warnings, + information notes, and debug information. + + https://github.com/pytorch/cpuinfo/tree/master/deps/clog diff --git a/buildroot-external/package/clog/clog.hash b/buildroot-external/package/clog/clog.hash new file mode 100644 index 00000000..2abfbe73 --- /dev/null +++ b/buildroot-external/package/clog/clog.hash @@ -0,0 +1 @@ +sha256 d3f3cb6ab398eb1ff66618444c47e8d82748dfdc85c1117276c52b12d8b5569c clog-4b5a76c4de21265ddba98fc8f259e136ad11411b.tar.gz diff --git a/buildroot-external/package/clog/clog.mk b/buildroot-external/package/clog/clog.mk new file mode 100644 index 00000000..9e6f6d34 --- /dev/null +++ b/buildroot-external/package/clog/clog.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# clog +# +################################################################################ + +CLOG_VERSION = 4b5a76c4de21265ddba98fc8f259e136ad11411b +CLOG_SITE = $(call github,pytorch,cpuinfo,$(CLOG_VERSION)) +CLOG_SUBDIR = deps/clog +CLOG_LICENSE = BSD-2-Clause +CLOG_LICENSE_FILES = LICENSE + +CLOG_SUPPORTS_IN_SOURCE_BUILD = NO +CLOG_CONF_OPTS = -DCLOG_BUILD_TESTS=OFF + +CLOG_INSTALL_STAGING = YES +CLOG_INSTALL_TARGET = NO + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/cpuinfo/Config.in b/buildroot-external/package/cpuinfo/Config.in new file mode 100644 index 00000000..2300b745 --- /dev/null +++ b/buildroot-external/package/cpuinfo/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_CPUINFO + bool "cpuinfo" + depends on BR2_INSTALL_LIBSTDCPP + help + cpuinfo is a library to detect essential for performance + optimization information about host CPU. + + https://github.com/pytorch/cpuinfo diff --git a/buildroot-external/package/cpuinfo/cpuinfo.hash b/buildroot-external/package/cpuinfo/cpuinfo.hash new file mode 100644 index 00000000..c3f70fa9 --- /dev/null +++ b/buildroot-external/package/cpuinfo/cpuinfo.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 0936848904943381b2c01321101614776e43d583840ee0f3ceeea1e3fb7405f7 cpuinfo-de2fa78ebb431db98489e78603e4f77c1f6c5c57.tar.gz +# License files, locally calculated +sha256 8e7e60636c3aa0cb03571a1a841ce5697f9551ff92b3c426c2561613d15ade70 LICENSE diff --git a/buildroot-external/package/cpuinfo/cpuinfo.mk b/buildroot-external/package/cpuinfo/cpuinfo.mk new file mode 100644 index 00000000..eb186cf1 --- /dev/null +++ b/buildroot-external/package/cpuinfo/cpuinfo.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# cpuinfo +# +################################################################################ + +CPUINFO_VERSION = de2fa78ebb431db98489e78603e4f77c1f6c5c57 +CPUINFO_SITE = $(call github,pytorch,cpuinfo,$(CPUINFO_VERSION)) +CPUINFO_LICENSE = BSD-2-Clause +CPUINFO_LICENSE_FILES = LICENSE +CPUINFO_INSTALL_STAGING = YES +CPUINFO_SUPPORTS_IN_SOURCE_BUILD = NO + +CPUINFO_CONF_OPTS = -DCPUINFO_BUILD_UNIT_TESTS=OFF \ + -DCPUINFO_BUILD_MOCK_TESTS=OFF \ + -DCPUINFO_BUILD_BENCHMARKS=OFF + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/farmhash/.farmhash.mk.swp b/buildroot-external/package/farmhash/.farmhash.mk.swp new file mode 100644 index 00000000..cea6947e Binary files /dev/null and b/buildroot-external/package/farmhash/.farmhash.mk.swp differ diff --git a/buildroot-external/package/farmhash/Config.in b/buildroot-external/package/farmhash/Config.in new file mode 100644 index 00000000..0ad16f93 --- /dev/null +++ b/buildroot-external/package/farmhash/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FARMHASH + bool "farmhash" + depends on BR2_INSTALL_LIBSTDCPP + help + FarmHash, a family of hash functions. + + https://github.com/google/farmhash diff --git a/buildroot-external/package/farmhash/farmhash.hash b/buildroot-external/package/farmhash/farmhash.hash new file mode 100644 index 00000000..afdfc0f9 --- /dev/null +++ b/buildroot-external/package/farmhash/farmhash.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 18392cf0736e1d62ecbb8d695c31496b6507859e8c75541d7ad0ba092dc52115 farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz +# License files, locally calculated +sha256 4162dd091caae234f72d3b57e138174f733e736b2430a4c51b098b17d866fcb6 COPYING diff --git a/buildroot-external/package/farmhash/farmhash.mk b/buildroot-external/package/farmhash/farmhash.mk new file mode 100644 index 00000000..6ab7d1a8 --- /dev/null +++ b/buildroot-external/package/farmhash/farmhash.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# farmhash +# +################################################################################ + +FARMHASH_VERSION = 0d859a811870d10f53a594927d0d0b97573ad06d +FARMHASH_SITE = $(call github,google,farmhash,$(FARMHASH_VERSION)) +FARMHASH_LICENSE = MIT +FARMHASH_LICENSE_FILES = COPYING +FARMHASH_INSTALL_STAGING = YES +FARMHASH_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" + +$(eval $(autotools-package)) diff --git a/buildroot-external/package/fft2d/Config.in b/buildroot-external/package/fft2d/Config.in new file mode 100644 index 00000000..38394f61 --- /dev/null +++ b/buildroot-external/package/fft2d/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FFT2D + bool "fft2d" + help + This is a package to calculate Discrete Fourier/Cosine/Sine + Transforms of 2,3-dimensional sequences of length 2^N. + + http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html diff --git a/buildroot-external/package/fft2d/fft2d.hash b/buildroot-external/package/fft2d/fft2d.hash new file mode 100644 index 00000000..a1b1a326 --- /dev/null +++ b/buildroot-external/package/fft2d/fft2d.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 ada7e99087c4ed477bfdf11413f2ba8db8a840ba9bbf8ac94f4f3972e2a7cec9 fft2d.tgz +# License files, locally calculated +sha256 0b2a2082537735a2a576dbec2e8f9c1a09812eac6df6a389502a6ba860072906 readme2d.txt diff --git a/buildroot-external/package/fft2d/fft2d.mk b/buildroot-external/package/fft2d/fft2d.mk new file mode 100644 index 00000000..6263b1af --- /dev/null +++ b/buildroot-external/package/fft2d/fft2d.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# fft2d +# +################################################################################ + +FFT2D_VERSION = 2006.12.28 +FFT2D_SITE = https://www.kurims.kyoto-u.ac.jp/~ooura +FFT2D_SOURCE = fft2d.tgz +FFT2D_LICENSE = readme2d.txt +FFT2D_LICENSE_FILES = readme2d.txt +FFT2D_INSTALL_STAGING = YES +FFT2D_INSTALL_TARGET = NO + +define FFT2D_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/fft2d + $(INSTALL) -m 0644 $(@D)/*.c $(STAGING_DIR)/usr/include/fft2d + $(INSTALL) -m 0644 $(@D)/*.f $(STAGING_DIR)/usr/include/fft2d + $(INSTALL) -m 0644 $(@D)/*.h $(STAGING_DIR)/usr/include/fft2d +endef + +$(eval $(generic-package)) diff --git a/buildroot-external/package/fp16/Config.in b/buildroot-external/package/fp16/Config.in new file mode 100644 index 00000000..283cd972 --- /dev/null +++ b/buildroot-external/package/fp16/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_FP16 + bool "fp16" + select BR2_PACKAGE_PSIMD + help + Header-only library for conversion to/from + half-precision floating point formats. + + https://github.com/Maratyszcza/FP16/ diff --git a/buildroot-external/package/fp16/fp16.hash b/buildroot-external/package/fp16/fp16.hash new file mode 100644 index 00000000..7b7feada --- /dev/null +++ b/buildroot-external/package/fp16/fp16.hash @@ -0,0 +1 @@ +sha256 a91f4770ff9c39f4d72e339c379f566b3bbb359fa66122d85fc0bae3dde7abc7 fp16-0a92994d729ff76a58f692d3028ca1b64b145d91.tar.gz diff --git a/buildroot-external/package/fp16/fp16.mk b/buildroot-external/package/fp16/fp16.mk new file mode 100644 index 00000000..bb1f3e0b --- /dev/null +++ b/buildroot-external/package/fp16/fp16.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# fp16 +# +################################################################################ + +FP16_VERSION = 0a92994d729ff76a58f692d3028ca1b64b145d91 +FP16_SITE = $(call github,Maratyszcza,FP16,$(FP16_VERSION)) +FP16_LICENSE = BSD-2-Clause +FP16_LICENSE_FILES = LICENSE + +FP16_SUPPORTS_IN_SOURCE_BUILD = NO +FP16_DEPENDENCIES = psimd + +FP16_CONF_OPTS = -DCMAKE_SYSTEM_NAME=Linux \ + -DCMAKE_SYSTEM_PROCESSOR=aarch64 \ + -DFP16_BUILD_TESTS=OFF \ + -DFP16_BUILD_BENCHMARKS=OFF + +FP16_INSTALL_STAGING = YES +FP16_INSTALL_TARGET = NO + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/fxdiv/Config.in b/buildroot-external/package/fxdiv/Config.in new file mode 100644 index 00000000..1ad177b8 --- /dev/null +++ b/buildroot-external/package/fxdiv/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FXDIV + bool "fxdiv" + help + C99/C++ header-only library for division + via fixed-point multiplication by inverse + + https://github.com/Maratyszcza/FXdiv/ diff --git a/buildroot-external/package/fxdiv/fxdiv.hash b/buildroot-external/package/fxdiv/fxdiv.hash new file mode 100644 index 00000000..e474cd32 --- /dev/null +++ b/buildroot-external/package/fxdiv/fxdiv.hash @@ -0,0 +1 @@ +sha256 9ccf554541666b5c089ad5dd465141d671c99971f36d72f313652f5c49ffce14 fxdiv-b408327ac2a15ec3e43352421954f5b1967701d1.tar.gz diff --git a/buildroot-external/package/fxdiv/fxdiv.mk b/buildroot-external/package/fxdiv/fxdiv.mk new file mode 100644 index 00000000..f5c73c01 --- /dev/null +++ b/buildroot-external/package/fxdiv/fxdiv.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# fxdiv +# +################################################################################ + +FXDIV_VERSION = b408327ac2a15ec3e43352421954f5b1967701d1 +FXDIV_SITE = $(call github,Maratyszcza,FXdiv,$(FXDIV_VERSION)) +FXDIV_LICENSE = BSD-2-Clause +FXDIV_LICENSE_FILES = LICENSE + +FXDIV_SUPPORTS_IN_SOURCE_BUILD = NO + +FXDIV_CONF_OPTS = -DCMAKE_SYSTEM_NAME=Linux \ + -DCMAKE_SYSTEM_PROCESSOR=aarch64 \ + -DFXDIV_BUILD_TESTS=OFF \ + -DFXDIV_BUILD_BENCHMARKS=OFF + +FXDIV_INSTALL_STAGING = YES +FXDIV_INSTALL_TARGET = NO + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/gemmlowp/Config.in b/buildroot-external/package/gemmlowp/Config.in new file mode 100644 index 00000000..24ba6e97 --- /dev/null +++ b/buildroot-external/package/gemmlowp/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_GEMMLOWP + bool "gemmlowp" + depends on BR2_INSTALL_LIBSTDCPP + help + Low-precision matrix multiplication. + + https://github.com/google/gemmlowp diff --git a/buildroot-external/package/gemmlowp/gemmlowp.hash b/buildroot-external/package/gemmlowp/gemmlowp.hash new file mode 100644 index 00000000..7c56a18b --- /dev/null +++ b/buildroot-external/package/gemmlowp/gemmlowp.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 cc8a22b6f071c3781e6b4b72654c89b1cdc198e72ebadebb17638eac205344c1 gemmlowp-08e4bb339e34017a0835269d4a37c4ea04d15a69.tar.gz +# License files, locally calculated +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot-external/package/gemmlowp/gemmlowp.mk b/buildroot-external/package/gemmlowp/gemmlowp.mk new file mode 100644 index 00000000..1a36fc48 --- /dev/null +++ b/buildroot-external/package/gemmlowp/gemmlowp.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# gemmlowp +# +################################################################################ + +GEMMLOWP_VERSION = 08e4bb339e34017a0835269d4a37c4ea04d15a69 +GEMMLOWP_SITE = $(call github,google,gemmlowp,$(GEMMLOWP_VERSION)) +GEMMLOWP_LICENSE = Apache-2.0 +GEMMLOWP_LICENSE_FILES = LICENSE +GEMMLOWP_INSTALL_STAGING = YES +GEMMLOWP_INSTALL_TARGET = NO +GEMMLOWP_SUBDIR = contrib + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/kf5-kconfig/kf5-kconfig.mk b/buildroot-external/package/kf5-kconfig/kf5-kconfig.mk index 61a85bae..98467ef0 100644 --- a/buildroot-external/package/kf5-kconfig/kf5-kconfig.mk +++ b/buildroot-external/package/kf5-kconfig/kf5-kconfig.mk @@ -23,4 +23,10 @@ endif KF5_KCONFIG_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(KF5_KCONFIG_CXXFLAGS)" +KF5_KCONFIG_POST_INSTALL_STAGING_HOOKS = KF5_KCONFIG_COMPILER_FIX + +define KF5_KCONFIG_COMPILER_FIX + cp /usr/lib/libexec/kf5/kconfig_compiler_kf5 $(STAGING_DIR)/usr/lib/libexec/ +endef + $(eval $(cmake-package)) diff --git a/buildroot-external/package/kf5-kservice/kf5-kservice.mk b/buildroot-external/package/kf5-kservice/kf5-kservice.mk index 83a6d26e..15731776 100644 --- a/buildroot-external/package/kf5-kservice/kf5-kservice.mk +++ b/buildroot-external/package/kf5-kservice/kf5-kservice.mk @@ -14,4 +14,10 @@ KF5_KSERVICE_DEPENDENCIES = host-pkgconf KF5_KSERVICE_INSTALL_STAGING = YES KF5_KSERVICE_SUPPORTS_IN_SOURCE_BUILD = NO +KF5_KSERVICE_POST_INSTALL_STAGING_HOOKS = KF5_KSERVICE_DESKTOPTOJSON + +define KF5_KSERVICE_DESKTOPTOJSON + cp /usr/bin/desktoptojson $(STAGING_DIR)/usr/bin/ +endef + $(eval $(cmake-package)) diff --git a/buildroot-external/package/neon2sse/Config.in b/buildroot-external/package/neon2sse/Config.in new file mode 100644 index 00000000..51144588 --- /dev/null +++ b/buildroot-external/package/neon2sse/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_NEON2SSE + bool "neon2sse" + help + NEON_2_SSE.h file is intended to simplify ARM->IA32 porting. + + https://github.com/intel/ARM_NEON_2_x86_SSE diff --git a/buildroot-external/package/neon2sse/neon2sse.hash b/buildroot-external/package/neon2sse/neon2sse.hash new file mode 100644 index 00000000..68c27f10 --- /dev/null +++ b/buildroot-external/package/neon2sse/neon2sse.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 019fbc7ec25860070a1d90e12686fc160cfb33e22aa063c80f52b363f1361e9d neon2sse-a15b489e1222b2087007546b4912e21293ea86ff.tar.gz +# License files, locally calculated +sha256 7022f51b439a5915e933ecc270c83e24ca0cb2cceeb08b0132dcd4dbb03ed2dc LICENSE diff --git a/buildroot-external/package/neon2sse/neon2sse.mk b/buildroot-external/package/neon2sse/neon2sse.mk new file mode 100644 index 00000000..763367ee --- /dev/null +++ b/buildroot-external/package/neon2sse/neon2sse.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# neon2see +# +################################################################################ + +NEON2SSE_VERSION = a15b489e1222b2087007546b4912e21293ea86ff +NEON2SSE_SITE = $(call github,intel,arm_neon_2_x86_sse,$(NEON2SSE_VERSION)) + +NEON2SSE_LICENSE = BSD-2-Clause +NEON2SSE_LICENSE_FILES = LICENSE + +NEON2SSE_INSTALL_STAGING = YES +NEON2SSE_INSTALL_TARGET = NO + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/psimd/Config.in b/buildroot-external/package/psimd/Config.in new file mode 100644 index 00000000..bd9cb66b --- /dev/null +++ b/buildroot-external/package/psimd/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PSIMD + bool "psimd" + help + Portable 128-bit SIMD intrinsics + + https://github.com/Maratyszcza/psimd/ diff --git a/buildroot-external/package/psimd/fp16.hash b/buildroot-external/package/psimd/fp16.hash new file mode 100644 index 00000000..f1b50b75 --- /dev/null +++ b/buildroot-external/package/psimd/fp16.hash @@ -0,0 +1 @@ +sha256 x fp16-0a92994d729ff76a58f692d3028ca1b64b145d91.tar.gz diff --git a/buildroot-external/package/psimd/psimd.mk b/buildroot-external/package/psimd/psimd.mk new file mode 100644 index 00000000..923076f0 --- /dev/null +++ b/buildroot-external/package/psimd/psimd.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# psimd +# +################################################################################ + +PSIMD_VERSION = 072586a71b55b7f8c584153d223e95687148a900 +PSIMD_SITE = $(call github,Maratyszcza,psimd,$(PSIMD_VERSION)) +PSIMD_LICENSE = BSD-2-Clause +PSIMD_LICENSE_FILES = LICENSE + +PSIMD_SUPPORTS_IN_SOURCE_BUILD = NO + +PSIMD_INSTALL_STAGING = YES +PSIMD_INSTALL_TARGET = NO + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/pthreadpool/Config.in b/buildroot-external/package/pthreadpool/Config.in new file mode 100644 index 00000000..dc8040ce --- /dev/null +++ b/buildroot-external/package/pthreadpool/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PTHREADPOOL + bool "pthreadpool" + select BR2_PACKAGE_FXDIV + help + Portable (POSIX/Windows/Emscripten) thread pool for C/C++ + + https://github.com/Maratyszcza/pthreadpool/ diff --git a/buildroot-external/package/pthreadpool/pthreadpool.hash b/buildroot-external/package/pthreadpool/pthreadpool.hash new file mode 100644 index 00000000..418c69a2 --- /dev/null +++ b/buildroot-external/package/pthreadpool/pthreadpool.hash @@ -0,0 +1 @@ +sha256 b4ad5741bec475b695afe90f94bdb5b8e3d23197e9dd144a7d3230b6e5f5eb56 pthreadpool-545ebe9f225aec6dca49109516fac02e973a3de2.tar.gz diff --git a/buildroot-external/package/pthreadpool/pthreadpool.mk b/buildroot-external/package/pthreadpool/pthreadpool.mk new file mode 100644 index 00000000..a25b2960 --- /dev/null +++ b/buildroot-external/package/pthreadpool/pthreadpool.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# pthreadpool +# +################################################################################ + +PTHREADPOOL_VERSION = 545ebe9f225aec6dca49109516fac02e973a3de2 +PTHREADPOOL_SITE = $(call github,Maratyszcza,pthreadpool,$(PTHREADPOOL_VERSION)) +PTHREADPOOL_LICENSE = BSD-2-Clause +PTHREADPOOL_LICENSE_FILES = LICENSE + +PTHREADPOOL_DEPENDENCIES = fxdiv +PTHREADPOOL_SUPPORTS_IN_SOURCE_BUILD = NO + +PTHREADPOOL_CONF_OPTS = -DCMAKE_SYSTEM_NAME=Linux \ + -DCMAKE_SYSTEM_PROCESSOR=aarch64 \ + -DPTHREADPOOL_LIBRARY_TYPE=shared \ + -DPTHREADPOOL_BUILD_TESTS=OFF \ + -DPTHREADPOOL_BUILD_BENCHMARKS=OFF + +PTHREADPOOL_INSTALL_STAGING = YES + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/ruy/Config.in b/buildroot-external/package/ruy/Config.in new file mode 100644 index 00000000..21b9e1dd --- /dev/null +++ b/buildroot-external/package/ruy/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_RUY + bool "ruy" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_CPUINFO + help + ruy is a matrix multiplication library. + Its focus is to cover the matrix multiplication + needs of neural network inference engines. + + Its initial user has been TensorFlow Lite, where + it is used by default on the ARM CPU architecture. + + https://github.com/google/ruy diff --git a/buildroot-external/package/ruy/ruy.hash b/buildroot-external/package/ruy/ruy.hash new file mode 100644 index 00000000..98266b58 --- /dev/null +++ b/buildroot-external/package/ruy/ruy.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 4da8572946007603378c5d0280f48c5b77f4d38763209f5306b57c7513d9a82e ruy-3168a5c8f4c447fd8cea94078121ee2e2cd87df0.tar.gz +# License files, locally calculated +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot-external/package/ruy/ruy.mk b/buildroot-external/package/ruy/ruy.mk new file mode 100644 index 00000000..60135b8e --- /dev/null +++ b/buildroot-external/package/ruy/ruy.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# ruy +# +################################################################################ + +RUY_VERSION = 3168a5c8f4c447fd8cea94078121ee2e2cd87df0 +RUY_SITE = $(call github,google,ruy,$(RUY_VERSION)) +RUY_LICENSE = Apache-2 +RUY_LICENSE_FILES = LICENSE +RUY_DEPENDENCIES = cpuinfo +RUY_SUPPORTS_IN_SOURCE_BUILD = NO +RUY_CONF_OPTS = -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DRUY_FIND_CPUINFO=ON \ + -DRUY_MINIMAL_BUILD=ON + +RUY_INSTALL_STAGING = YES + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/tensorflow-lite/0001-lite-Update-CMakeLists.txt.patch b/buildroot-external/package/tensorflow-lite/0001-lite-Update-CMakeLists.txt.patch new file mode 100644 index 00000000..53b51706 --- /dev/null +++ b/buildroot-external/package/tensorflow-lite/0001-lite-Update-CMakeLists.txt.patch @@ -0,0 +1,49 @@ +From 081c2e4e3cf021efb2853a485a18b563e88f6117 Mon Sep 17 00:00:00 2001 +From: Terry Heo +Date: Tue, 1 Nov 2022 15:55:30 -0700 +Subject: [PATCH] lite: Update CMakeLists.txt + +This changes are needed to build kernel tests. + +PiperOrigin-RevId: 485439972 + +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +081c2e4e3cf021efb2853a485a18b563e88f6117] +--- + tensorflow/lite/CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt +index 9dfbb4b72f3..fd8b3faf1e2 100644 +--- a/tensorflow/lite/CMakeLists.txt ++++ b/tensorflow/lite/CMakeLists.txt +@@ -209,6 +209,9 @@ list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*tflite_with_xnnpack\\.cc$") + # Exclude Flex related files. + list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*with_selected_ops\\.cc$") + ++# Exclude tensorflow_profiler_logger files. ++list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*tensorflow_profiler_logger\\.cc$") ++ + if(_TFLITE_ENABLE_MMAP) + list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*mmap_allocation_disabled\\.cc$") + else() +@@ -222,6 +225,7 @@ if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "iOS") + endif() + populate_tflite_source_vars("core" TFLITE_CORE_SRCS) + populate_tflite_source_vars("core/api" TFLITE_CORE_API_SRCS) ++populate_tflite_source_vars("core/c" TFLITE_CORE_C_SRCS) + populate_tflite_source_vars("c" TFLITE_C_SRCS) + populate_tflite_source_vars("delegates" TFLITE_DELEGATES_SRCS) + if(TFLITE_ENABLE_GPU) +@@ -483,6 +487,7 @@ endif() + # TFLite library + set(_ALL_TFLITE_SRCS + ${TFLITE_CORE_API_SRCS} ++ ${TFLITE_CORE_C_SRCS} + ${TFLITE_CORE_SRCS} + ${TFLITE_C_SRCS} + ${TFLITE_DELEGATES_FLEX_SRCS} +-- +2.34.1 + diff --git a/buildroot-external/package/tensorflow-lite/0002-Fix-FindFlatBuffers-cmake-file.patch b/buildroot-external/package/tensorflow-lite/0002-Fix-FindFlatBuffers-cmake-file.patch new file mode 100644 index 00000000..e97bb3e5 --- /dev/null +++ b/buildroot-external/package/tensorflow-lite/0002-Fix-FindFlatBuffers-cmake-file.patch @@ -0,0 +1,37 @@ +From a4ff4b5e952a22906ac0ed01e73f84f42926c325 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 24 Nov 2022 14:29:06 -0700 +Subject: [PATCH] Fix FindFlatBuffers cmake file + +Capitalization needs to match for system cmake override to work: +https://github.com/google/flatbuffers/blob/v22.11.23/CMake/FindFlatBuffers.cmake + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/tensorflow/tensorflow/pull/58677] +--- + tensorflow/lite/CMakeLists.txt | 2 +- + .../modules/{FindFlatbuffers.cmake => FindFlatBuffers.cmake} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + rename tensorflow/lite/tools/cmake/modules/{FindFlatbuffers.cmake => FindFlatBuffers.cmake} (100%) + +diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt +index f9c30d6a046..c2ee9edfb61 100644 +--- a/tensorflow/lite/CMakeLists.txt ++++ b/tensorflow/lite/CMakeLists.txt +@@ -143,7 +143,7 @@ find_package(absl REQUIRED) + find_package(Eigen3 REQUIRED) + find_package(farmhash REQUIRED) + find_package(fft2d REQUIRED) +-find_package(Flatbuffers REQUIRED) ++find_package(FlatBuffers REQUIRED) + find_package(gemmlowp REQUIRED) + find_package(NEON_2_SSE REQUIRED) + find_package(cpuinfo REQUIRED) #CPUINFO is used by XNNPACK and RUY library +diff --git a/tensorflow/lite/tools/cmake/modules/FindFlatbuffers.cmake b/tensorflow/lite/tools/cmake/modules/FindFlatBuffers.cmake +similarity index 100% +rename from tensorflow/lite/tools/cmake/modules/FindFlatbuffers.cmake +rename to tensorflow/lite/tools/cmake/modules/FindFlatBuffers.cmake +-- +2.34.1 + diff --git a/buildroot-external/package/tensorflow-lite/0003-Don-t-link-tensorflow-lite-against-gemmlowp.patch b/buildroot-external/package/tensorflow-lite/0003-Don-t-link-tensorflow-lite-against-gemmlowp.patch new file mode 100644 index 00000000..dbee9942 --- /dev/null +++ b/buildroot-external/package/tensorflow-lite/0003-Don-t-link-tensorflow-lite-against-gemmlowp.patch @@ -0,0 +1,32 @@ +From fb584589f707853d85a081c99b1b82598c2631c1 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 24 Nov 2022 15:10:27 -0700 +Subject: [PATCH] Don't link tensorflow-lite against gemmlowp + +We can't link against gemmlowp as it is a header only library. + +Fixes: +/bin/ld: cannot find -lgemmlowp: No such file or directory + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/tensorflow/tensorflow/pull/58678] +--- + tensorflow/lite/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt +index f9c30d6a046..3fe5ed15605 100644 +--- a/tensorflow/lite/CMakeLists.txt ++++ b/tensorflow/lite/CMakeLists.txt +@@ -560,7 +560,6 @@ target_link_libraries(tensorflow-lite + farmhash + fft2d_fftsg2d + flatbuffers::flatbuffers +- gemmlowp + ruy::ruy + pthreadpool + ${CMAKE_DL_LIBS} +-- +2.34.1 + diff --git a/buildroot-external/package/tensorflow-lite/0004-Do-not-search-for-XNNPACK.patch b/buildroot-external/package/tensorflow-lite/0004-Do-not-search-for-XNNPACK.patch new file mode 100644 index 00000000..c26c3a12 --- /dev/null +++ b/buildroot-external/package/tensorflow-lite/0004-Do-not-search-for-XNNPACK.patch @@ -0,0 +1,28 @@ +From 5fc3c283ac382e564152d71ad7c711cf758e52a0 Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Wed, 7 Dec 2022 17:19:58 +0100 +Subject: [PATCH 1/1] Do not search for XNNPACK We will take care of that + everything will be installed. (No clue yet how to solve this) + +--- + tensorflow/lite/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt +index 273b80de71a..13cd59dac7b 100644 +--- a/tensorflow/lite/CMakeLists.txt ++++ b/tensorflow/lite/CMakeLists.txt +@@ -398,8 +398,8 @@ else() + ) + endif() + if(TFLITE_ENABLE_XNNPACK) +- find_package(fp16_headers REQUIRED) +- find_package(XNNPACK REQUIRED) ++ #find_package(fp16_headers REQUIRED) ++ #find_package(XNNPACK REQUIRED) + populate_tflite_source_vars("delegates/xnnpack" + TFLITE_DELEGATES_XNNPACK_SRCS + FILTER ".*(_test|_tester)\\.(cc|h)" +-- +2.34.1 + diff --git a/buildroot-external/package/tensorflow-lite/Config.in b/buildroot-external/package/tensorflow-lite/Config.in index 9b7abe95..f880dbc7 100644 --- a/buildroot-external/package/tensorflow-lite/Config.in +++ b/buildroot-external/package/tensorflow-lite/Config.in @@ -1,10 +1,33 @@ config BR2_PACKAGE_TENSORFLOW_LITE - bool "tensorflow-lite" - help - TensorFlow Lite is the official solution for running - machine learning models on mobile and embedded devices. - It enables on-device machine learning inference with - low latency and a small binary size on Android, iOS, - and other operating systems. + bool "tensorflow-lite" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_SHARED_LIBS + depends on ( BR2_arm && BR2_ARM_CPU_ARMV7A ) || ( BR2_aarch64 && BR2_ARM_CPU_ARMV8A ) + select BR2_PACKAGE_CPUINFO + select BR2_PACKAGE_EIGEN + select BR2_PACKAGE_FARMHASH + select BR2_PACKAGE_FFT2D + select BR2_PACKAGE_FLATBUFFERS + select BR2_PACKAGE_GEMMLOWP + select BR2_PACKAGE_LIBABSEIL_CPP + select BR2_PACKAGE_NEON2SSE + select BR2_PACKAGE_RUY + select BR2_PACKAGE_XNNPACK + help + Tensorflow Lite dynamic library and headers: Inference engine to run previously trained machine learning models. - https://www.tensorflow.org/lite/ +comment "tensorflow-lite needs needs a toolchain w/ gcc >= 9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_9 + +comment "tensorflow-lite needs a toolchain w/ glibc, C++, threads" + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS + +comment "tensorflow-lite needs a toolchain w/ shared libraries" + depends on !BR2_SHARED_LIBS + +comment "tensorflow-lite in buildroot currently only supports arm + armv7a cpu or arm64 + armv8a cpu targets" + depends on ( BR2_arm && !BR2_ARM_CPU_ARMV7A ) || ( BR2_aarch64 && !BR2_ARM_CPU_ARMV8A) || (!BR2_arm && !BR2_aarch64) diff --git a/buildroot-external/package/tensorflow-lite/tensorflow-lite.hash b/buildroot-external/package/tensorflow-lite/tensorflow-lite.hash index 0fe487d8..e575590e 100644 --- a/buildroot-external/package/tensorflow-lite/tensorflow-lite.hash +++ b/buildroot-external/package/tensorflow-lite/tensorflow-lite.hash @@ -1,2 +1,4 @@ -# Locally computed -sha256 b5a1bb04c84b6fe1538377e5a1f649bb5d5f0b2e3625a3c526ff3a8af88633e8 tensorflow-lite-v2.10.0.tar.gz +# Locally calculated +sha256 99c732b92b1b37fc243a559e02f9aef5671771e272758aa4aec7f34dc92dac48 tensorflow-lite-v2.11.0.tar.gz +# License files, locally calculated +sha256 71c6915d04265772a0339bed47276942c678b45cc01534210ebe6984fd1aec65 LICENSE diff --git a/buildroot-external/package/tensorflow-lite/tensorflow-lite.mk b/buildroot-external/package/tensorflow-lite/tensorflow-lite.mk index 71914ef3..89432b0b 100644 --- a/buildroot-external/package/tensorflow-lite/tensorflow-lite.mk +++ b/buildroot-external/package/tensorflow-lite/tensorflow-lite.mk @@ -4,172 +4,100 @@ # ################################################################################ -TENSORFLOW_LITE_VERSION = v2.10.0 +TENSORFLOW_LITE_VERSION = v2.11.0 TENSORFLOW_LITE_SITE = $(call github,tensorflow,tensorflow,$(TENSORFLOW_LITE_VERSION)) TENSORFLOW_LITE_SUBDIR = tensorflow/lite -TENSORFLOW_LITE_LICENSE = Apache License 2.0 +TENSORFLOW_LITE_LICENSE = Apache-2.0 +TENSORFLOW_LITE_LICENSE_FILES = LICENSE TENSORFLOW_LITE_INSTALL_STAGING = YES - -TENSORFLOW_LITE_DEPENDENCIES = host-pkgconf TENSORFLOW_LITE_SUPPORTS_IN_SOURCE_BUILD = NO +TENSORFLOW_LITE_DEPENDENCIES += \ + host-pkgconf \ + host-flatbuffers \ + cpuinfo \ + eigen \ + farmhash \ + fft2d \ + flatbuffers \ + gemmlowp \ + libabseil-cpp \ + neon2sse \ + ruy \ + xnnpack -#TENSORFLOW_LITE_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -funsafe-math-optimizations -#TENSORFLOW_LITE_CONF_OPTS += CXXFLAGS="$(TARGET_CFLAGS) -funsafe-math-optimizations - -TENSORFLOW_LITE_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -funsafe-math-optimizations \ - -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - -I$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/include \ - -I$(STAGING_DIR)/usr/include/pybind11" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -funsafe-math-optimizations \ - -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - -I$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/include \ - -I$(STAGING_DIR)/usr/include/pybind11" \ - -DCMAKE_SYSTEM_NAME=Linux \ - -DCMAKE_SYSTEM_PROCESSOR=aarch64 +TENSORFLOW_LITE_CONF_OPTS = \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -funsafe-math-optimizations \ + -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + -I$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/include \ + -I$(STAGING_DIR)/usr/include/pybind11 \ + -I$(STAGING_DIR)/usr/include/gemmlowp" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -funsafe-math-optimizations \ + -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + -I$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/include \ + -I$(STAGING_DIR)/usr/include/pybind11 \ + -I$(STAGING_DIR)/usr/include/gemmlowp" \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -Dabsl_DIR=$(STAGING_DIR)/usr/lib/cmake/absl \ + -DEigen3_DIR=$(STAGING_DIR)/usr/share/eigen3/cmake \ + -DFARMHASH_SOURCE_DIR=$(FARMHASH_DIR) \ + -Dfarmhash_DIR=$(STAGING_DIR)/usr/lib \ + -DFETCHCONTENT_FULLY_DISCONNECTED=ON \ + -DFETCHCONTENT_QUIET=OFF \ + -DFFT2D_SOURCE_DIR=$(STAGING_DIR)/usr/include/fft2d \ + -DFlatBuffers_DIR=$(STAGING_DIR)/usr/lib/cmake/flatbuffers \ + -DNEON_2_SSE_DIR=$(STAGING_DIR)/usr/lib/cmake/NEON_2_SSE \ + -DTFLITE_ENABLE_EXTERNAL_DELEGATE=ON \ + -DTFLITE_ENABLE_GPU=OFF \ + -DTFLITE_ENABLE_INSTALL=ON \ + -DTFLITE_ENABLE_MMAP=ON \ + -DTFLITE_ENABLE_NNAPI=ON \ + -DTFLITE_ENABLE_RUY=ON \ + -DTFLITE_ENABLE_XNNPACK=ON TENSORFLOW_LITE_MAKE_OPTS += _pywrap_tensorflow_interpreter_wrapper -TENSORFLOW_LITE_POST_INSTALL_TARGET_HOOKS = TENSORFLOW_LITE_INSTALL_TFLITE_RUNTIME +#TENSORFLOW_LITE_POST_INSTALL_TARGET_HOOKS = TENSORFLOW_LITE_INSTALL_TFLITE_RUNTIME define TENSORFLOW_LITE_INSTALL_TFLITE_RUNTIME -# Install all tflite-runtime files manually -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/types/libabsl_bad_optional_access.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/types/libabsl_bad_variant_access.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/base/libabsl_base.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/base/libabsl_log_severity.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/base/libabsl_malloc_internal.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/base/libabsl_raw_logging_internal.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/base/libabsl_spinlock_wait.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/base/libabsl_throw_delegate.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/base/libabsl_strerror.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/hash/libabsl_city.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/hash/libabsl_hash.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/hash/libabsl_low_level_hash.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/time/libabsl_civil_time.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/time/libabsl_time.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/time/libabsl_time_zone.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/strings/libabsl_cord_internal.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/strings/libabsl_cord.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/strings/libabsl_cordz_functions.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/strings/libabsl_cordz_handle.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/strings/libabsl_cordz_info.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/strings/libabsl_str_format_internal.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/strings/libabsl_strings_internal.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/strings/libabsl_strings.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/debugging/libabsl_debugging_internal.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/debugging/libabsl_demangle_internal.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/debugging/libabsl_stacktrace.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/debugging/libabsl_symbolize.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/profiling/libabsl_exponential_biased.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/flags/libabsl_flags_commandlineflag_internal.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/flags/libabsl_flags_commandlineflag.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/flags/libabsl_flags_config.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/flags/libabsl_flags_internal.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/flags/libabsl_flags_marshalling.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/flags/libabsl_flags_private_handle_accessor.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/flags/libabsl_flags_program_name.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/flags/libabsl_flags_reflection.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/flags/libabsl_flags.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/synchronization/libabsl_graphcycles_internal.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/synchronization/libabsl_synchronization.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/container/libabsl_hashtablez_sampler.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/container/libabsl_raw_hash_set.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/numeric/libabsl_int128.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/abseil-cpp-build/absl/status/libabsl_status.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/cpuinfo-build/libcpuinfo.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/farmhash-build/libfarmhash.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/fft2d-build/libfft2d_fftsg2d.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/fft2d-build/libfft2d_fftsg.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_deps/xnnpack-build/libXNNPACK.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/pthreadpool/libpthreadpool.so \ -$(TARGET_DIR)/usr/lib/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/libtensorflow-lite.so \ -$(TARGET_DIR)/usr/lib/ -mkdir -p $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime -mkdir -p $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-2.10.0-py3.10.egg-info + mkdir -p $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime + mkdir -p $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-2.11.0-py3.10.egg-info -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_pywrap_tensorflow_interpreter_wrapper.so \ -$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ + $(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/buildroot-build/_pywrap_tensorflow_interpreter_wrapper.so \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/python/interpreter.py \ -$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ + $(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/python/interpreter.py \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/python/metrics/metrics_interface.py \ -$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ + $(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/python/metrics/metrics_interface.py \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ -$(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/python/metrics/metrics_portable.py \ -$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ + $(INSTALL) -D -m 755 $(@D)/$(TENSORFLOW_LITE_SUBDIR)/python/metrics/metrics_portable.py \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ -$(INSTALL) -D -m 755 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/__init__.py \ -$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ + $(INSTALL) -D -m 755 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/__init__.py \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ -$(INSTALL) -D -m 755 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/MANIFEST.in \ -$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ + $(INSTALL) -D -m 755 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/MANIFEST.in \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime/ -$(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/dependency_links.txt \ -$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-2.10.0-py3.10.egg-info/ + $(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/dependency_links.txt \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-2.11.0-py3.10.egg-info/ -$(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/PKG-INFO \ -$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-2.10.0-py3.10.egg-info/ + $(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/PKG-INFO \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-2.11.0-py3.10.egg-info/ -$(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/requires.txt \ -$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-2.10.0-py3.10.egg-info/ + $(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/requires.txt \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-2.11.0-py3.10.egg-info/ -$(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/SOURCES.txt \ -$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-2.10.0-py3.10.egg-info/ + $(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/SOURCES.txt \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-2.11.0-py3.10.egg-info/ -$(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/top_level.txt \ -$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-2.10.0-py3.10.egg-info/ + $(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/tensorflow-lite/tflite_runtime/top_level.txt \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/tflite_runtime-2.11.0-py3.10.egg-info/ endef diff --git a/buildroot-external/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/PKG-INFO b/buildroot-external/package/tensorflow-lite/tflite_runtime/PKG-INFO similarity index 100% rename from buildroot-external/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/PKG-INFO rename to buildroot-external/package/tensorflow-lite/tflite_runtime/PKG-INFO diff --git a/buildroot-external/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/SOURCES.txt b/buildroot-external/package/tensorflow-lite/tflite_runtime/SOURCES.txt similarity index 100% rename from buildroot-external/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/SOURCES.txt rename to buildroot-external/package/tensorflow-lite/tflite_runtime/SOURCES.txt diff --git a/buildroot-external/package/tensorflow-lite/tflite_runtime/__init__.py b/buildroot-external/package/tensorflow-lite/tflite_runtime/__init__.py index a5ceb0cb..c61ec86a 100755 --- a/buildroot-external/package/tensorflow-lite/tflite_runtime/__init__.py +++ b/buildroot-external/package/tensorflow-lite/tflite_runtime/__init__.py @@ -1,2 +1,2 @@ -__version__ = '2.10.0' -__git_version__ = 'b5a1bb04c84b6fe1538377e5a1f649bb5d5f0b2e3625a3c526ff3a8af88633e8' +__version__ = '2.11.0' +__git_version__ = 'd5b57ca93e506df258271ea00fc29cf98383a374' diff --git a/buildroot-external/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/dependency_links.txt b/buildroot-external/package/tensorflow-lite/tflite_runtime/dependency_links.txt similarity index 100% rename from buildroot-external/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/dependency_links.txt rename to buildroot-external/package/tensorflow-lite/tflite_runtime/dependency_links.txt diff --git a/buildroot-external/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/requires.txt b/buildroot-external/package/tensorflow-lite/tflite_runtime/requires.txt similarity index 100% rename from buildroot-external/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/requires.txt rename to buildroot-external/package/tensorflow-lite/tflite_runtime/requires.txt diff --git a/buildroot-external/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/top_level.txt b/buildroot-external/package/tensorflow-lite/tflite_runtime/top_level.txt similarity index 100% rename from buildroot-external/package/tensorflow-lite/tflite_runtime-2.10.0-py3.10.egg-info/top_level.txt rename to buildroot-external/package/tensorflow-lite/tflite_runtime/top_level.txt diff --git a/buildroot-external/package/xnnpack/Config.in b/buildroot-external/package/xnnpack/Config.in new file mode 100644 index 00000000..472ec412 --- /dev/null +++ b/buildroot-external/package/xnnpack/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_XNNPACK + bool "xnnpack" + select BR2_PACKAGE_CLOG + select BR2_PACKAGE_CPUINFO + select BR2_PACKAGE_PTHREADPOOL + select BR2_PACKAGE_FP16 + help + High-efficiency floating-point neural network + inference operators for mobile, server, and Web + + https://github.com/google/XNNPACK diff --git a/buildroot-external/package/xnnpack/xnnpack.hash b/buildroot-external/package/xnnpack/xnnpack.hash new file mode 100644 index 00000000..bf74211c --- /dev/null +++ b/buildroot-external/package/xnnpack/xnnpack.hash @@ -0,0 +1 @@ +sha256 5016bf69478ebbd2ea424f95aa011cebbc820025719ce24e32f4a974ed7e9863 xnnpack-a50369c0fdd15f0f35b1a91c964644327a88d480.tar.gz diff --git a/buildroot-external/package/xnnpack/xnnpack.mk b/buildroot-external/package/xnnpack/xnnpack.mk new file mode 100644 index 00000000..7056a4ad --- /dev/null +++ b/buildroot-external/package/xnnpack/xnnpack.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# xnnpack +# +################################################################################ + +XNNPACK_VERSION = a50369c0fdd15f0f35b1a91c964644327a88d480 +XNNPACK_SITE = $(call github,google,XNNPACK,$(XNNPACK_VERSION)) + +XNNPACK_LICENSE = BSD-2-Clause +XNNPACK_LICENSE_FILES = LICENSE + +XNNPACK_DEPENDENCIES = clog cpuinfo pthreadpool fp16 + +XNNPACK_INSTALL_STAGING = YES +XNNPACK_SUPPORTS_IN_SOURCE_BUILD = NO + +XNNPACK_CONF_OPTS = -DXNNPACK_BUILD_TESTS=OFF \ + -DXNNPACK_BUILD_BENCHMARKS=OFF \ + -DXNNPACK_USE_SYSTEM_LIBS=ON \ + -DXNNPACK_USE_SYSTEM_LIBS=ON + +$(eval $(cmake-package)) diff --git a/buildroot-external/package/xorgproto-mesafix/Config.in b/buildroot-external/package/xorgproto-mesafix/Config.in new file mode 100644 index 00000000..8e697271 --- /dev/null +++ b/buildroot-external/package/xorgproto-mesafix/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_XORGPROTO_MESAFIX + bool "xorgproto-mesafix" + help + This package combines the protocol headers, which were + formerly scattered in individual packages. diff --git a/buildroot-external/package/xorgproto-mesafix/xorgproto-mesafix.hash b/buildroot-external/package/xorgproto-mesafix/xorgproto-mesafix.hash new file mode 100644 index 00000000..802217ce --- /dev/null +++ b/buildroot-external/package/xorgproto-mesafix/xorgproto-mesafix.hash @@ -0,0 +1,41 @@ +# From https://lists.x.org/archives/xorg-announce/2021-September/date.html +sha256 aa2f663b8dbd632960b24f7477aa07d901210057f6ab1a1db5158732569ca015 xorgproto-2021.5.tar.bz2 +sha512 0f5c4ee4fd56cd46f4d5850bcf3e04c92d2e98de54d0113987cb49fc83cf1f4d0e50e976333179c72fe2178cfa15ec6c1bfc4e76fc3bc2a4be80616ce079da87 xorgproto-2021.5.tar.bz2 + +# Locally computed +sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto +sha256 dabc025f93129a0eb2d17f37c719dbe5ecbcb5bc8f7bc7f4ce89fe04576cc0c2 COPYING-bigreqsproto +sha256 ab587ca94282c1e60797ffe4a77aea195418387db20ec7e0c24cedf2c844f8c1 COPYING-compositeproto +sha256 f67a18cb46c4c203c5122b4a901cfcc3178b2a62f83f31ca5fef5bdca3966094 COPYING-damageproto +sha256 819e8dcd3dd2a44850c350331aa492230f86bccb0983dd739dec5ba36d7d2b8e COPYING-dmxproto +sha256 0c306691492c4d7a8cda1ec3847668b797887dddcd7e986b4c166ae27619af7d COPYING-dri2proto +sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING-dri3proto +sha256 0aa43d03da3cedbd9882c0ded621b0d855353eb9e551f9eed940d75c8a0b03c1 COPYING-evieproto +sha256 65cb0b867b00fb27f066a37353713b265645b3301146562570d7638ed2ddd548 COPYING-fixesproto +sha256 1ab381e978bff63d68be2e4f235d51935f3f16f3ba3bebf83afa99a70c0484a2 COPYING-fontcacheproto +sha256 f4af05774b02ae149357cc26f7bf5ef1116c2e09373c2492081a3a1892c58417 COPYING-fontsproto +sha256 823deb4673d3f26aa8c90e704888299648f00be3262f9363eaeecedcd65b936d COPYING-glproto +sha256 5e083a2ace0215a6084c877c023a6079952ba803d692488203ba4269196debe3 COPYING-inputproto +sha256 d397a67d4b28e897bc5fce79b2b917df9905b54f961fc3ad1f49c7fe3803f92c COPYING-kbproto +sha256 7a5dd5d4c989c167da50f15879959f42bbda960e06d0a0aea7197f61fe1dc846 COPYING-lg3dproto +sha256 8442b5f22f2fb13017a4302a906e7dedc899267b41f613558970941120170128 COPYING-pmproto +sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING-presentproto +sha256 6b890b118261694865988378dbba876bcd9caa1a421c5c0d626116948bc0ae35 COPYING-printproto +sha256 41c13dcd09147ed2440286f2fb8151df8ebee06deee4ed78ddf094601c216d3d COPYING-randrproto +sha256 ee10aee0f1697ffdbe870a39f037361d4f7136f2976bb7919a41b3f66407caee COPYING-recordproto +sha256 9e48921a94da36d7a69fe71809223ee0bb46370db9842dccdeeb55b5a9946872 COPYING-renderproto +sha256 403e7be948674530ad40669b1e3a31adeddb656502f3b0ef810d5d3cc35d0b52 COPYING-resourceproto +sha256 fcbd3c628bf4d28ee3e6032054bf44bbe58f3b1a944dad856a8d3eb6b37ea412 COPYING-scrnsaverproto +sha256 d6d3513f5a7099748dc387f54498d799380b45f8a444f13aa98aa45a860ae55b COPYING-trapproto +sha256 f8f49bbad61967ebc890fb79fff5bfb7cfc1c341aa8f8dee13eb3fb534040b47 COPYING-videoproto +sha256 eb183a00c61bb47992f096b6993ed7ec17518bea9c285fe87efff7f622cc6c12 COPYING-windowswmproto +sha256 3bd8e0c41497bfe6ab8d11c3c90c5e79edd0b2437f2bf81161575f54bae53f21 COPYING-x11proto +sha256 5531d18cfcc944dab39991f63f182cbbce3fe493ba0c7cf08a25c0d01ee84482 COPYING-xcmiscproto +sha256 fb42146c6c06a200a9b121220eb692ff9101ba0fbd0b224b9e16a016c59ae86a COPYING-xextproto +sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86bigfontproto +sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86dgaproto +sha256 4a05d06752388d9db71ee1006f371d4fb2c316a821fc2fc272db90b3ef978334 COPYING-xf86driproto +sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86miscproto +sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86rushproto +sha256 942bb46a3503a708948491699171b00b9e0dfb47818d9268b160bccc5f51a4b9 COPYING-xf86vidmodeproto +sha256 b2d8cda803e900915ce10f0ba735ff2c033b39c7cc5a8a436667ca583d4066fa COPYING-xineramaproto diff --git a/buildroot-external/package/xorgproto-mesafix/xorgproto-mesafix.mk b/buildroot-external/package/xorgproto-mesafix/xorgproto-mesafix.mk new file mode 100644 index 00000000..30c2efb2 --- /dev/null +++ b/buildroot-external/package/xorgproto-mesafix/xorgproto-mesafix.mk @@ -0,0 +1,53 @@ +################################################################################ +# +# xorgproto +# +################################################################################ + +XORGPROTO_MESAFIX_VERSION = 2021.5 +XORGPROTO_MESAFIX_SOURCE = xorgproto-$(XORGPROTO_MESAFIX_VERSION).tar.bz2 +XORGPROTO_MESAFIX_SITE = https://xorg.freedesktop.org/archive/individual/proto +XORGPROTO_MESAFIX_LICENSE = MIT +XORGPROTO_MESAFIX_LICENSE_FILES = \ + COPYING-applewmproto \ + COPYING-bigreqsproto \ + COPYING-compositeproto \ + COPYING-damageproto \ + COPYING-dmxproto \ + COPYING-dri2proto \ + COPYING-dri3proto \ + COPYING-evieproto \ + COPYING-fixesproto \ + COPYING-fontcacheproto \ + COPYING-fontsproto \ + COPYING-glproto \ + COPYING-inputproto \ + COPYING-kbproto \ + COPYING-lg3dproto \ + COPYING-pmproto \ + COPYING-presentproto \ + COPYING-printproto \ + COPYING-randrproto \ + COPYING-recordproto \ + COPYING-renderproto \ + COPYING-resourceproto \ + COPYING-scrnsaverproto \ + COPYING-trapproto \ + COPYING-videoproto \ + COPYING-windowswmproto \ + COPYING-x11proto \ + COPYING-xcmiscproto \ + COPYING-xextproto \ + COPYING-xf86bigfontproto \ + COPYING-xf86dgaproto \ + COPYING-xf86driproto \ + COPYING-xf86miscproto \ + COPYING-xf86rushproto \ + COPYING-xf86vidmodeproto \ + COPYING-xineramaproto +XORGPROTO_MESAFIX_INSTALL_STAGING = YES +XORGPROTO_MESAFIX_INSTALL_TARGET = NO +# xproxymngproto is needed by xfindproxy +XORGPROTO_MESAFIX_CONF_OPTS += --enable-legacy + +$(eval $(autotools-package)) diff --git a/buildroot-patches/0013-Bump-eigen-to-3.4.0.patch b/buildroot-patches/0013-Bump-eigen-to-3.4.0.patch new file mode 100644 index 00000000..0c82b26b --- /dev/null +++ b/buildroot-patches/0013-Bump-eigen-to-3.4.0.patch @@ -0,0 +1,152 @@ +From 31086b9e6ea8d816ee988981bbb09715d7ba5cb8 Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Wed, 7 Dec 2022 09:24:26 +0100 +Subject: [PATCH 1/1] Bump eigen to 3.4.0 + +--- + ...ons-for-controlling-build-components.patch | 85 +++++++++++++++++++ + package/eigen/eigen.hash | 4 +- + package/eigen/eigen.mk | 16 +++- + 3 files changed, 100 insertions(+), 5 deletions(-) + create mode 100644 package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch + +diff --git a/package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch b/package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch +new file mode 100644 +index 0000000000..693e610d0a +--- /dev/null ++++ b/package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch +@@ -0,0 +1,85 @@ ++From cf82186416d04ea5df2a397d8fe09dc78d40ca65 Mon Sep 17 00:00:00 2001 ++From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= ++Date: Sat, 5 Mar 2022 05:49:45 +0000 ++Subject: [PATCH] Adds new CMake Options for controlling build components. ++ ++[Retrieved from: ++https://gitlab.com/libeigen/eigen/-/commit/cf82186416d04ea5df2a397d8fe09dc78d40ca65] ++Signed-off-by: Fabrice Fontaine ++--- ++ CMakeLists.txt | 6 ++++++ ++ blas/CMakeLists.txt | 3 ++- ++ lapack/CMakeLists.txt | 5 +++++ ++ 3 files changed, 13 insertions(+), 1 deletion(-) ++ ++diff --git a/CMakeLists.txt b/CMakeLists.txt ++index de1c23e91..0af36a53a 100644 ++--- a/CMakeLists.txt +++++ b/CMakeLists.txt ++@@ -477,6 +477,9 @@ if(EIGEN_BUILD_TESTING) ++ add_subdirectory(failtest) ++ endif() ++ +++include(CMakeDetermineFortranCompiler) +++option(EIGEN_BUILD_BLAS "Toggles the building of the Eigen Blas library" ${CMAKE_Fortran_COMPILER}) +++option(EIGEN_BUILD_LAPACK "Toggles the building of the included Eigen LAPACK library" ${CMAKE_Fortran_COMPILER}) ++ if(EIGEN_LEAVE_TEST_IN_ALL_TARGET) ++ add_subdirectory(blas) ++ add_subdirectory(lapack) ++@@ -611,6 +614,8 @@ set_target_properties (eigen PROPERTIES EXPORT_NAME Eigen) ++ ++ install (TARGETS eigen EXPORT Eigen3Targets) ++ +++option(EIGEN_BUILD_CMAKE_PACKAGE "Enables the creation of EigenConfig.cmake and related files" ON) +++if(EIGEN_BUILD_CMAKE_PACKAGE) ++ configure_package_config_file ( ++ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Eigen3Config.cmake.in ++ ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake ++@@ -655,6 +660,7 @@ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake ++ # Add uninstall target ++ add_custom_target ( uninstall ++ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/EigenUninstall.cmake) +++endif() ++ ++ if (EIGEN_SPLIT_TESTSUITE) ++ ei_split_testsuite("${EIGEN_SPLIT_TESTSUITE}") ++diff --git a/blas/CMakeLists.txt b/blas/CMakeLists.txt ++index 8d3cb86dc..c530957fb 100644 ++--- a/blas/CMakeLists.txt +++++ b/blas/CMakeLists.txt ++@@ -1,6 +1,7 @@ ++ ++ project(EigenBlas CXX) ++ +++if(EIGEN_BUILD_BLAS) ++ include(CheckLanguage) ++ check_language(Fortran) ++ if(CMAKE_Fortran_COMPILER) ++@@ -59,4 +60,4 @@ if(EIGEN_BUILD_TESTING) ++ endif() ++ ++ endif() ++- +++endif() ++diff --git a/lapack/CMakeLists.txt b/lapack/CMakeLists.txt ++index c8ca64001..8d6d75401 100644 ++--- a/lapack/CMakeLists.txt +++++ b/lapack/CMakeLists.txt ++@@ -1,5 +1,7 @@ ++ project(EigenLapack CXX) ++ +++if(EIGEN_BUILD_LAPACK AND EIGEN_BUILD_BLAS) +++ ++ include(CheckLanguage) ++ check_language(Fortran) ++ if(CMAKE_Fortran_COMPILER) ++@@ -457,3 +459,6 @@ if(EXISTS ${eigen_full_path_to_testing_lapack}) ++ ++ endif() ++ +++elseif(EIGEN_BUILD_LAPACK AND NOT EIGEN_BUILD_BLAS) +++ message(FATAL_ERROR "EIGEN_BUILD_LAPACK requires EIGEN_BUILD_BLAS") +++endif() #EIGEN_BUILD_LAPACK ++-- ++GitLab ++ +diff --git a/package/eigen/eigen.hash b/package/eigen/eigen.hash +index 5ec561ad10..ad7d6da9dc 100644 +--- a/package/eigen/eigen.hash ++++ b/package/eigen/eigen.hash +@@ -1,6 +1,6 @@ + # Locally computed +-sha256 685adf14bd8e9c015b78097c1dc22f2f01343756f196acdc76a678e1ae352e11 eigen-3.3.7.tar.bz2 +-sha256 4f877e5ae4672568ef82cfd0023e2cef4a7cf55d867ab249efc9569a7eb9e5b1 COPYING.BSD ++sha256 b4c198460eba6f28d34894e3a5710998818515104d6e74e5cc331ce31e46e626 eigen-3.4.0.tar.bz2 ++sha256 51928dce36213c5333ba3172e847d735d4c6e9b7ff2722a326c49067155b82eb COPYING.BSD + sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL + sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL + sha256 f5b330efdad110cdd84d585ec61220b0650461fa599e36b13e1726c9346dcfb9 COPYING.MINPACK +diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk +index 98e6c61e38..7fe3fbdac6 100644 +--- a/package/eigen/eigen.mk ++++ b/package/eigen/eigen.mk +@@ -4,7 +4,7 @@ + # + ################################################################################ + +-EIGEN_VERSION = 3.3.7 ++EIGEN_VERSION = 3.4.0 + EIGEN_SOURCE = eigen-$(EIGEN_VERSION).tar.bz2 + EIGEN_SITE = $(call gitlab,libeigen,eigen,$(EIGEN_VERSION)) + EIGEN_LICENSE = MPL2, BSD-3-Clause, LGPL-2.1 +@@ -15,7 +15,17 @@ EIGEN_SUPPORTS_IN_SOURCE_BUILD = NO + + # Default Eigen CMake installs .pc file in /usr/share/pkgconfig + # change it to /usr/lib/pkgconfig, to be consistent with other packages. +-EIGEN_CONF_OPTS = -DPKGCONFIG_INSTALL_DIR=/usr/lib/pkgconfig \ +- -DCMAKE_Fortran_COMPILER=$(TARGET_FC) ++EIGEN_CONF_OPTS = -DPKGCONFIG_INSTALL_DIR=/usr/lib/pkgconfig ++ ++ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) ++EIGEN_CONF_OPTS += \ ++ -DCMAKE_Fortran_COMPILER=$(TARGET_FC) \ ++ -DEIGEN_BUILD_BLAS=ON \ ++ -DEIGEN_BUILD_LAPACK=ON ++else ++EIGEN_CONF_OPTS += \ ++ -DEIGEN_BUILD_BLAS=OFF \ ++ -DEIGEN_BUILD_LAPACK=OFF ++endif + + $(eval $(cmake-package)) +-- +2.34.1 + diff --git a/buildroot-patches/0013-Bump-mesa3d-to-22.1.6.patch b/buildroot-patches/0013-Bump-mesa3d-to-22.1.6.patch deleted file mode 100644 index de74391c..00000000 --- a/buildroot-patches/0013-Bump-mesa3d-to-22.1.6.patch +++ /dev/null @@ -1,916 +0,0 @@ -From a3774189661cb372d766c6e0064760c371029329 Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Mon, 12 Sep 2022 15:26:50 +0200 -Subject: [PATCH 1/1] Bump mesa3d to 22.1.6 - ---- - Config.in.legacy | 31 +++++ - package/clang/Config.in | 10 +- - package/compiler-rt/Config.in | 15 +++ - package/libclc/Config.in | 5 + - package/lld/Config.in.host | 5 + - package/llvm/Config.in | 10 +- - package/llvm/llvm.hash | 4 +- - package/llvm/llvm.mk | 20 +-- - package/mesa3d-headers/mesa3d-headers.mk | 12 +- - package/mesa3d/0006-fix-valist.patch | 37 ----- - ...emove-needless-c99-compat-h-includes.patch | 126 ++++++++++++++++++ - package/mesa3d/0007-fix-cpp-detection.patch | 40 ------ - .../0007-include-drop-c11-compat-h.patch | 100 ++++++++++++++ - package/mesa3d/0008-Fix-uClibc-build.patch | 65 +++++++++ - package/mesa3d/Config.in | 79 ++--------- - package/mesa3d/mesa3d.hash | 9 +- - package/mesa3d/mesa3d.mk | 16 +-- - package/qt5/qt5tools/Config.in | 3 +- - 18 files changed, 386 insertions(+), 201 deletions(-) - create mode 100644 package/compiler-rt/Config.in - delete mode 100644 package/mesa3d/0006-fix-valist.patch - create mode 100644 package/mesa3d/0006-util-remove-needless-c99-compat-h-includes.patch - delete mode 100644 package/mesa3d/0007-fix-cpp-detection.patch - create mode 100644 package/mesa3d/0007-include-drop-c11-compat-h.patch - create mode 100644 package/mesa3d/0008-Fix-uClibc-build.patch - -diff --git a/Config.in.legacy b/Config.in.legacy -index 97d6197aeb..13082dd2c0 100644 ---- a/Config.in.legacy -+++ b/Config.in.legacy -@@ -146,6 +146,37 @@ endif - - comment "Legacy options removed in 2022.02" - -+config BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 -+ bool "mesa DRI i915 driver removed" -+ select BR2_LEGACY -+ help -+ The DRI i915 driver was removed upstream. -+ -+config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 -+ bool "mesa DRI i965 driver removed" -+ select BR2_LEGACY -+ help -+ The DRI i965 driver was removed upstream. -+ -+config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU -+ bool "mesa DRI nouveau driver removed" -+ select BR2_LEGACY -+ help -+ The DRI radeon nouveau was removed upstream. -+ -+config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON -+ bool "mesa DRI radeon r100 driver removed" -+ select BR2_LEGACY -+ help -+ The DRI radeon r100 driver was removed upstream. -+ -+config BR2_GCC_VERSION_9_X -+ bool "gcc 9.x support removed" -+ select BR2_LEGACY -+ help -+ Support for gcc version 9.x has been removed. The current -+ default version (11.x or later) has been selected instead. -+ - config BR2_PACKAGE_PHP_EXT_WDDX - bool "php wddx removed" - select BR2_LEGACY -diff --git a/package/clang/Config.in b/package/clang/Config.in -index a67e7631a8..e4d455781e 100644 ---- a/package/clang/Config.in -+++ b/package/clang/Config.in -@@ -1,12 +1,13 @@ - config BR2_PACKAGE_CLANG - bool "clang" - depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS -- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 -+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future - depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR # std::wstring -+ depends on BR2_HOST_GCC_AT_LEAST_5 - select BR2_PACKAGE_LLVM - help - Clang is a C/C++, Objective C/C++ and OpenCL C front-end -@@ -14,11 +15,12 @@ config BR2_PACKAGE_CLANG - - http://clang.llvm.org - --comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" -+comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" - depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ -- !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ -- || BR2_STATIC_LIBS || !BR2_USE_WCHAR -+ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ -+ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ -+ || !BR2_HOST_GCC_AT_LEAST_5 - - comment "clang needs a toolchain not affected by GCC bug 64735" - depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS -diff --git a/package/compiler-rt/Config.in b/package/compiler-rt/Config.in -new file mode 100644 -index 0000000000..02169b66c0 ---- /dev/null -+++ b/package/compiler-rt/Config.in -@@ -0,0 +1,15 @@ -+config BR2_PACKAGE_COMPILER_RT -+ bool "compiler-rt" -+ depends on BR2_PACKAGE_LLVM -+ depends on BR2_TOOLCHAIN_USES_GLIBC # asan lib requires -+ depends on BR2_HOST_GCC_AT_LEAST_5 # host-clang -+ help -+ A collection of runtime libraries primarily used by clang and -+ llvm to provide builtins, sanitizer runtimes, and profiling -+ at runtime. -+ -+ https://compiler-rt.llvm.org/ -+ -+comment "compiler-rt requires llvm to be enabled, a glibc toolchain, host gcc >= 5" -+ depends on !BR2_PACKAGE_LLVM -+ depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_HOST_GCC_AT_LEAST_5 -diff --git a/package/libclc/Config.in b/package/libclc/Config.in -index 797f090bfc..938933fdd3 100644 ---- a/package/libclc/Config.in -+++ b/package/libclc/Config.in -@@ -1,9 +1,14 @@ - config BR2_PACKAGE_LIBCLC - bool "libclc" - depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS -+ depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm - help - libclc is an open source, BSD licensed implementation of - the library requirements of the OpenCL C programming language, - as specified by the OpenCL 1.1 Specification. - - http://libclc.llvm.org/ -+ -+comment "libclc needs host gcc >= 5" -+ depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS -+ depends on !BR2_HOST_GCC_AT_LEAST_5 -diff --git a/package/lld/Config.in.host b/package/lld/Config.in.host -index f016f3445e..d015fdd520 100644 ---- a/package/lld/Config.in.host -+++ b/package/lld/Config.in.host -@@ -1,6 +1,7 @@ - config BR2_PACKAGE_HOST_LLD - bool "host lld" - depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm -+ depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm - help - LLD is a linker from the LLVM project that is a drop-in - replacement for system linkers, and runs much faster than -@@ -8,3 +9,7 @@ config BR2_PACKAGE_HOST_LLD - toolchain developers. - - https://lld.llvm.org/ -+ -+comment "host lld needs host gcc >= 5" -+ depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS -+ depends on !BR2_HOST_GCC_AT_LEAST_5 -diff --git a/package/llvm/Config.in b/package/llvm/Config.in -index 6ec2ffcfe6..8aefc483d8 100644 ---- a/package/llvm/Config.in -+++ b/package/llvm/Config.in -@@ -14,12 +14,13 @@ config BR2_PACKAGE_LLVM_TARGET_ARCH - config BR2_PACKAGE_LLVM - bool "llvm" - depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS -- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 -+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future - depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR # std::wstring -+ depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm - help - The LLVM Project is a collection of modular and reusable - compiler and toolchain technologies. -@@ -55,11 +56,12 @@ config BR2_PACKAGE_LLVM_BPF - - endif - --comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" -+comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" - depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ -- !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ -- || BR2_STATIC_LIBS || !BR2_USE_WCHAR -+ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ -+ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ -+ || !BR2_HOST_GCC_AT_LEAST_5 - - comment "llvm needs a toolchain not affected by GCC bug 64735" - depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS -diff --git a/package/llvm/llvm.hash b/package/llvm/llvm.hash -index 6bf2755777..e7f79492de 100644 ---- a/package/llvm/llvm.hash -+++ b/package/llvm/llvm.hash -@@ -1,3 +1,3 @@ - # locally calculated --sha256 00a1ee1f389f81e9979f3a640a01c431b3021de0d42278f6508391a2f0b81c9a llvm-9.0.1.src.tar.xz --sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT -+sha256 ce8508e318a01a63d4e8b3090ab2ded3c598a50258cc49e2625b9120d4c03ea5 llvm-11.1.0.src.tar.xz -+sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT -diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk -index 6c721c30b9..825de96392 100644 ---- a/package/llvm/llvm.mk -+++ b/package/llvm/llvm.mk -@@ -5,7 +5,7 @@ - ################################################################################ - - # LLVM, Clang and lld should be version bumped together --LLVM_VERSION = 9.0.1 -+LLVM_VERSION = 11.1.0 - LLVM_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VERSION) - LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz - LLVM_LICENSE = Apache-2.0 with exceptions -@@ -157,15 +157,9 @@ LLVM_CONF_OPTS += -DLLVM_ENABLE_PIC=ON - HOST_LLVM_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release - LLVM_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release - --# Disable C++1y (ISO C++ 2014 standard) --# Disable C++1z (ISO C++ 2017 standard) --# Compile llvm with the C++11 (ISO C++ 2011 standard) which is the fallback. --HOST_LLVM_CONF_OPTS += \ -- -DLLVM_ENABLE_CXX1Y=OFF \ -- -DLLVM_ENABLE_CXX1Z=OFF --LLVM_CONF_OPTS += \ -- -DLLVM_ENABLE_CXX1Y=OFF \ -- -DLLVM_ENABLE_CXX1Z=OFF -+# Compile llvm with the C++14 (ISO C++ 2014 standard). -+HOST_LLVM_CONF_OPTS += -DCMAKE_CXX_STANDARD=14 -+LLVM_CONF_OPTS += -DCMAKE_CXX_STANDARD=14 - - # Disabled, requires sys/ndir.h header - # Disable debug in module -@@ -237,13 +231,11 @@ endif - HOST_LLVM_CONF_OPTS += \ - -DLLVM_BUILD_EXTERNAL_COMPILER_RT=OFF \ - -DLLVM_BUILD_RUNTIME=OFF \ -- -DLLVM_INCLUDE_RUNTIMES=OFF \ -- -DLLVM_POLLY_BUILD=OFF -+ -DLLVM_INCLUDE_RUNTIMES=OFF - LLVM_CONF_OPTS += \ - -DLLVM_BUILD_EXTERNAL_COMPILER_RT=OFF \ - -DLLVM_BUILD_RUNTIME=OFF \ -- -DLLVM_INCLUDE_RUNTIMES=OFF \ -- -DLLVM_POLLY_BUILD=OFF -+ -DLLVM_INCLUDE_RUNTIMES=OFF - - HOST_LLVM_CONF_OPTS += \ - -DLLVM_ENABLE_WARNINGS=ON \ -diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk -index 871cf2f495..448a244b9f 100644 ---- a/package/mesa3d-headers/mesa3d-headers.mk -+++ b/package/mesa3d-headers/mesa3d-headers.mk -@@ -12,7 +12,7 @@ endif - - # Not possible to directly refer to mesa3d variables, because of - # first/second expansion trickery... --MESA3D_HEADERS_VERSION = 21.3.5 -+MESA3D_HEADERS_VERSION = 22.1.6 - MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz - MESA3D_HEADERS_SITE = https://archive.mesa3d.org - MESA3D_HEADERS_DL_SUBDIR = mesa3d -@@ -33,19 +33,9 @@ MESA3D_HEADERS_DIRS += GL - - ifeq ($(BR2_PACKAGE_XORG7),y) - --# Not using $(SED) because we do not want to work in-place, and $(SED) --# contains -i. --define MESA3D_HEADERS_BUILD_DRI_PC -- sed -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \ -- package/mesa3d-headers/dri.pc \ -- >$(@D)/src/mesa/drivers/dri/dri.pc --endef -- - define MESA3D_HEADERS_INSTALL_DRI_PC - $(INSTALL) -D -m 0644 $(@D)/include/GL/internal/dri_interface.h \ - $(STAGING_DIR)/usr/include/GL/internal/dri_interface.h -- $(INSTALL) -D -m 0644 $(@D)/src/mesa/drivers/dri/dri.pc \ -- $(STAGING_DIR)/usr/lib/pkgconfig/dri.pc - endef - - endif # Xorg -diff --git a/package/mesa3d/0006-fix-valist.patch b/package/mesa3d/0006-fix-valist.patch -deleted file mode 100644 -index 84a254cec5..0000000000 ---- a/package/mesa3d/0006-fix-valist.patch -+++ /dev/null -@@ -1,37 +0,0 @@ --From f6892df8eb115fa712fd69068432b48b028e1e54 Mon Sep 17 00:00:00 2001 --From: Bernd Kuhls --Date: Sat, 20 Nov 2021 22:48:54 +0100 --Subject: [PATCH] util/u_printf.h: fix build --MIME-Version: 1.0 --Content-Type: text/plain; charset=UTF-8 --Content-Transfer-Encoding: 8bit -- --Fixes build error with uClibc and gcc-9.3.0: -- --In file included from ../src/util/u_printf.cpp:24: --../src/util/u_printf.h:43:41: error: ‘va_list’ has not been declared -- 43 | size_t u_printf_length(const char *fmt, va_list untouched_args); -- --Patch sent upstream: --https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13897 -- --Signed-off-by: Bernd Kuhls ----- -- src/util/u_printf.h | 1 + -- 1 file changed, 1 insertion(+) -- --diff --git a/src/util/u_printf.h b/src/util/u_printf.h --index 44dcce5529f..14f324de10c 100644 ----- a/src/util/u_printf.h --+++ b/src/util/u_printf.h --@@ -25,6 +25,7 @@ -- #ifdef __cplusplus -- -- #include --+#include -- -- /* find next valid printf specifier in a C++ std::string */ -- size_t util_printf_next_spec_pos(const std::string &s, size_t pos); ---- --GitLab -- -diff --git a/package/mesa3d/0006-util-remove-needless-c99-compat-h-includes.patch b/package/mesa3d/0006-util-remove-needless-c99-compat-h-includes.patch -new file mode 100644 -index 0000000000..cac61b351a ---- /dev/null -+++ b/package/mesa3d/0006-util-remove-needless-c99-compat-h-includes.patch -@@ -0,0 +1,126 @@ -+From 9f717b5f23cbf24dc4c58bc688c931af91975e80 Mon Sep 17 00:00:00 2001 -+From: Erik Faye-Lund -+Date: Wed, 1 Jun 2022 14:17:43 +0200 -+Subject: util: remove needless c99_compat.h includes -+ -+Reviewed-by: Jesse Natalie -+Reviewed-by: Alyssa Rosenzweig -+Reviewed-by: Eric Engestrom -+Part-of: -+ -+Downloaded from upstream commit -+https://cgit.freedesktop.org/mesa/mesa/patch/?id=9f717b5f23cbf24dc4c58bc688c931af91975e80 -+ -+Signed-off-by: Bernd Kuhls -+--- -+ src/util/bitscan.h | 2 -- -+ src/util/compiler.h | 2 -- -+ src/util/format_srgb.h | 1 - -+ src/util/hash_table.h | 1 - -+ src/util/list.h | 1 - -+ src/util/macros.h | 1 - -+ src/util/mesa-sha1.h | 1 - -+ src/util/ptralloc.h | 1 - -+ 8 files changed, 10 deletions(-) -+ -+diff --git a/src/util/bitscan.h b/src/util/bitscan.h -+index 726d2d2c385..53cbb91e98c 100644 -+--- a/src/util/bitscan.h -++++ b/src/util/bitscan.h -+@@ -42,8 +42,6 @@ -+ #include -+ #endif -+ -+-#include "c99_compat.h" -+- -+ #ifdef __cplusplus -+ extern "C" { -+ #endif -+diff --git a/src/util/compiler.h b/src/util/compiler.h -+index 83f8e346a08..d184ad455af 100644 -+--- a/src/util/compiler.h -++++ b/src/util/compiler.h -+@@ -38,8 +38,6 @@ -+ -+ #include "util/macros.h" -+ -+-#include "c99_compat.h" /* inline, __func__, etc. */ -+- -+ -+ /** -+ * Either define MESA_BIG_ENDIAN or MESA_LITTLE_ENDIAN, and CPU_TO_LE32. -+diff --git a/src/util/format_srgb.h b/src/util/format_srgb.h -+index 596af56f4cd..5861b238270 100644 -+--- a/src/util/format_srgb.h -++++ b/src/util/format_srgb.h -+@@ -39,7 +39,6 @@ -+ -+ #include -+ #include -+-#include "c99_compat.h" -+ -+ extern const float -+ util_format_srgb_8unorm_to_linear_float_table[256]; -+diff --git a/src/util/hash_table.h b/src/util/hash_table.h -+index c8a96b79edf..002d6c58873 100644 -+--- a/src/util/hash_table.h -++++ b/src/util/hash_table.h -+@@ -31,7 +31,6 @@ -+ #include -+ #include -+ #include -+-#include "c99_compat.h" -+ #include "macros.h" -+ -+ #ifdef __cplusplus -+diff --git a/src/util/list.h b/src/util/list.h -+index 5ef49e4e955..edc596f3d2d 100644 -+--- a/src/util/list.h -++++ b/src/util/list.h -+@@ -41,7 +41,6 @@ -+ #include -+ #include -+ #include -+-#include "c99_compat.h" -+ -+ #ifdef DEBUG -+ # define list_assert(cond, msg) assert(cond && msg) -+diff --git a/src/util/macros.h b/src/util/macros.h -+index 2138f5d662d..a5dc4846211 100644 -+--- a/src/util/macros.h -++++ b/src/util/macros.h -+@@ -27,7 +27,6 @@ -+ #include -+ #include -+ -+-#include "c99_compat.h" -+ #include "c11_compat.h" -+ -+ #include -+diff --git a/src/util/mesa-sha1.h b/src/util/mesa-sha1.h -+index 9d174fd9b99..809fabc525f 100644 -+--- a/src/util/mesa-sha1.h -++++ b/src/util/mesa-sha1.h -+@@ -26,7 +26,6 @@ -+ #include -+ #include -+ #include -+-#include "c99_compat.h" -+ #include "sha1/sha1.h" -+ -+ #ifdef __cplusplus -+diff --git a/src/util/ptralloc.h b/src/util/ptralloc.h -+index f74d8c3645d..ca6ded82a2d 100644 -+--- a/src/util/ptralloc.h -++++ b/src/util/ptralloc.h -+@@ -29,7 +29,6 @@ -+ #include -+ #include -+ #include -+-#include "c99_compat.h" -+ #include "macros.h" -+ -+ #ifdef __cplusplus -+-- -+cgit v1.2.1 -+ -diff --git a/package/mesa3d/0007-fix-cpp-detection.patch b/package/mesa3d/0007-fix-cpp-detection.patch -deleted file mode 100644 -index 2e097277de..0000000000 ---- a/package/mesa3d/0007-fix-cpp-detection.patch -+++ /dev/null -@@ -1,40 +0,0 @@ --From ab5519971a090863f8c559907766e0b2382e0471 Mon Sep 17 00:00:00 2001 --From: Bernd Kuhls --Date: Sat, 20 Nov 2021 23:02:18 +0100 --Subject: [PATCH] c11_compat.h: fix uClibc build --MIME-Version: 1.0 --Content-Type: text/plain; charset=UTF-8 --Content-Transfer-Encoding: 8bit -- --Fixes build error with uClibc and gcc-9.3.0: -- --../src/egl/main/egldisplay.c: In function ‘_eglGetNativePlatformFromEnv’: --../src/egl/main/egldisplay.c:101:4: error: implicit declaration of function ‘static_assert’ [-Werror=implicit-function-declaration] -- 101 | static_assert(ARRAY_SIZE(egl_platforms) == _EGL_NUM_PLATFORMS, -- --CC: 21.3 -- --Patch sent upstream: --https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13898 -- --Signed-off-by: Bernd Kuhls ----- -- include/c11_compat.h | 2 -- -- 1 file changed, 2 deletions(-) -- --diff --git a/include/c11_compat.h b/include/c11_compat.h --index d35740f47a4..cdcd3f1f52f 100644 ----- a/include/c11_compat.h --+++ b/include/c11_compat.h --@@ -8,8 +8,6 @@ -- -- #if defined(__cplusplus) -- /* This is C++ code, not C */ ---#elif (__STDC_VERSION__ >= 201112L) --- /* Already C11 */ -- #else -- -- ---- --GitLab -- -diff --git a/package/mesa3d/0007-include-drop-c11-compat-h.patch b/package/mesa3d/0007-include-drop-c11-compat-h.patch -new file mode 100644 -index 0000000000..64cdb8074b ---- /dev/null -+++ b/package/mesa3d/0007-include-drop-c11-compat-h.patch -@@ -0,0 +1,100 @@ -+From df2dd474c73982e89d0ed71951ff723eb7060ce6 Mon Sep 17 00:00:00 2001 -+From: Erik Faye-Lund -+Date: Wed, 1 Jun 2022 13:38:39 +0200 -+Subject: include: drop c11_compat.h -+ -+We now require C11, and C++ supports static_assert just fine, which is -+the only thing this header ever added support for. So let's get rid of -+this needless header. -+ -+Reviewed-by: Jesse Natalie -+Reviewed-by: Alyssa Rosenzweig -+Reviewed-by: Eric Engestrom -+Part-of: -+ -+Downloaded from upstream commit -+https://cgit.freedesktop.org/mesa/mesa/commit/?id=df2dd474c73982e89d0ed71951ff723eb7060ce6 -+ -+Signed-off-by: Bernd Kuhls -+--- -+ include/c11_compat.h | 27 --------------------------- -+ src/amd/common/ac_sqtt.h | 1 - -+ src/imagination/vulkan/pvr_cmd_buffer.c | 1 - -+ src/util/macros.h | 3 --- -+ 4 files changed, 32 deletions(-) -+ delete mode 100644 include/c11_compat.h -+ -+diff --git a/include/c11_compat.h b/include/c11_compat.h -+deleted file mode 100644 -+index d35740f47a4..00000000000 -+--- a/include/c11_compat.h -++++ /dev/null -+@@ -1,27 +0,0 @@ -+-/* Copyright 2019 Intel Corporation */ -+-/* SPDX-License-Identifier: MIT */ -+- -+-#include "no_extern_c.h" -+- -+-#ifndef _C11_COMPAT_H_ -+-#define _C11_COMPAT_H_ -+- -+-#if defined(__cplusplus) -+- /* This is C++ code, not C */ -+-#elif (__STDC_VERSION__ >= 201112L) -+- /* Already C11 */ -+-#else -+- -+- -+-/* -+- * C11 static_assert() macro -+- * assert.h only defines that name for C11 and above -+- */ -+-#ifndef static_assert -+-#define static_assert _Static_assert -+-#endif -+- -+- -+-#endif /* !C++ && !C11 */ -+- -+-#endif /* _C11_COMPAT_H_ */ -+diff --git a/src/amd/common/ac_sqtt.h b/src/amd/common/ac_sqtt.h -+index 55130aa2221..05798b7e1da 100644 -+--- a/src/amd/common/ac_sqtt.h -++++ b/src/amd/common/ac_sqtt.h -+@@ -30,7 +30,6 @@ -+ #include -+ -+ #include -+-#include "c11_compat.h" -+ #include "ac_rgp.h" -+ -+ struct radeon_cmdbuf; -+diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c -+index 0afd463e2fb..4fe224f481d 100644 -+--- a/src/imagination/vulkan/pvr_cmd_buffer.c -++++ b/src/imagination/vulkan/pvr_cmd_buffer.c -+@@ -29,7 +29,6 @@ -+ #include -+ #include -+ -+-#include "c11_compat.h" -+ #include "hwdef/rogue_hw_defs.h" -+ #include "hwdef/rogue_hw_utils.h" -+ #include "pvr_bo.h" -+diff --git a/src/util/macros.h b/src/util/macros.h -+index a5dc4846211..dd8af86bcf8 100644 -+--- a/src/util/macros.h -++++ b/src/util/macros.h -+@@ -26,9 +26,6 @@ -+ -+ #include -+ #include -+- -+-#include "c11_compat.h" -+- -+ #include -+ -+ /* Compute the size of an array */ -+-- -+cgit v1.2.1 -+ -diff --git a/package/mesa3d/0008-Fix-uClibc-build.patch b/package/mesa3d/0008-Fix-uClibc-build.patch -new file mode 100644 -index 0000000000..70ff5e2b4c ---- /dev/null -+++ b/package/mesa3d/0008-Fix-uClibc-build.patch -@@ -0,0 +1,65 @@ -+From 09ce52fe375a6fc1ccf51b6b691aaa2c3f53fbd5 Mon Sep 17 00:00:00 2001 -+From: Bernd Kuhls -+Date: Fri, 3 Jun 2022 16:26:03 +0200 -+Subject: [PATCH] Fix uClibc build -+MIME-Version: 1.0 -+Content-Type: text/plain; charset=UTF-8 -+Content-Transfer-Encoding: 8bit -+ -+Fixes build errors with uClibc and gcc-9.3.0: -+ -+../src/gallium/drivers/lima/lima_texture.c:47:15: error: expected -+ declaration specifiers or ‘...’ before ‘__builtin_offsetof’ -+ 47 | static_assert(offsetof(lima_tex_desc, va) == 24, -+ "lima_tex_desc->va offset isn't 24"); -+ -+../src/egl/main/egldisplay.c: In function ‘_eglGetNativePlatformFromEnv’: -+ ../src/egl/main/egldisplay.c:101:4: error: implicit declaration of -+ function ‘static_assert’ [-Werror=implicit-function-declaration] 101 | -+ static_assert(ARRAY_SIZE(egl_platforms) == _EGL_NUM_PLATFORMS, -+ -+Patch sent upstream: -+https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13898 -+ -+Signed-off-by: Bernd Kuhls -+--- -+ src/egl/main/egldisplay.c | 1 + -+ src/util/compiler.h | 10 ++++++++++ -+ 2 files changed, 11 insertions(+) -+ -+diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c -+index 131fc22786f9..d3e2bb96e2f6 100644 -+--- a/src/egl/main/egldisplay.c -++++ b/src/egl/main/egldisplay.c -+@@ -42,6 +42,7 @@ -+ #endif -+ #include -+ #include "c11/threads.h" -++#include "util/compiler.h" -+ #include "util/macros.h" -+ #include "util/os_file.h" -+ #include "util/u_atomic.h" -+diff --git a/src/util/compiler.h b/src/util/compiler.h -+index d184ad455af9..b5c56807acc6 100644 -+--- a/src/util/compiler.h -++++ b/src/util/compiler.h -+@@ -36,6 +36,16 @@ -+ -+ #include -+ -++/* -++ * C11 static_assert() macro -++ * assert.h only defines that name for C11 and above -++ */ -++#if !defined(__cplusplus) -++#ifndef static_assert -++#define static_assert _Static_assert -++#endif -++#endif -++ -+ #include "util/macros.h" -+ -+ -+-- -+GitLab -+ -diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in -index e41da562dc..40f7009492 100644 ---- a/package/mesa3d/Config.in -+++ b/package/mesa3d/Config.in -@@ -24,19 +24,21 @@ config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS - config BR2_PACKAGE_MESA3D_LLVM - bool "llvm support" - depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS -- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 -+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future - depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR # std::wstring -+ depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm - select BR2_PACKAGE_LLVM - --comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" -+comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" - depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ -- !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ -- || BR2_STATIC_LIBS || !BR2_USE_WCHAR -+ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ -+ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ -+ || !BR2_HOST_GCC_AT_LEAST_5 - - comment "llvm support needs a toolchain not affected by GCC bug 64735" - depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS -@@ -63,16 +65,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - bool - select BR2_PACKAGE_MESA3D_DRIVER - --config BR2_PACKAGE_MESA3D_DRI_DRIVER -- bool -- select BR2_PACKAGE_MESA3D_DRI3 if \ -- (BR2_PACKAGE_XORG7 && BR2_TOOLCHAIN_HAS_SYNC_4 && \ -- !BR2_RISCV_32) -- select BR2_PACKAGE_MESA3D_DRIVER -- select BR2_PACKAGE_MESA3D_GBM if \ -- !BR2_PACKAGE_MESA3D_OPENGL_GLX && \ -- !BR2_PACKAGE_MESA3D_OPENGL_EGL -- - config BR2_PACKAGE_MESA3D_VULKAN_DRIVER - bool - select BR2_PACKAGE_MESA3D_DRIVER -@@ -134,16 +126,11 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO - config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 - bool "Gallium i915 driver" - depends on BR2_i386 || BR2_x86_64 -- depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 - select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_LIBDRM_INTEL - help - Support for i915-based Intel GPUs. - --comment "Gallium i915: Only one i915 provider can be built" -- depends on BR2_i386 || BR2_x86_64 -- depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 -- - config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS - bool "Gallium iris driver" - depends on BR2_i386 || BR2_x86_64 -@@ -330,49 +317,6 @@ comment "Gallium XvMC state tracker needs X.org and gallium drivers r600 or nouv - !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ - || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) - --comment "DRI drivers" -- --config BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 -- bool "DRI i915 driver" -- depends on BR2_i386 || BR2_x86_64 -- select BR2_PACKAGE_MESA3D_DRI_DRIVER -- select BR2_PACKAGE_LIBDRM_INTEL -- help -- Support for i915-based Intel GPUs. -- --config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 -- bool "DRI i965 driver" -- depends on BR2_i386 || BR2_x86_64 -- depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h -- select BR2_PACKAGE_MESA3D_DRI_DRIVER -- select BR2_PACKAGE_LIBDRM_INTEL -- help -- Support for i965-based Intel GPUs. -- --comment "DRI i965 driver needs a toolchain w/ headers >= 3.17" -- depends on BR2_i386 || BR2_x86_64 -- depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 -- --config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU -- bool "DRI nouveau driver" -- select BR2_PACKAGE_MESA3D_DRI_DRIVER -- select BR2_PACKAGE_LIBDRM_NOUVEAU -- help -- Support for Nvidia-based GPUs. -- --config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON -- bool "DRI radeon r100 driver" -- depends on BR2_i386 || BR2_x86_64 -- # libdrm's radeon option depends on LIBDRM_HAS_ATOMIC. Propagating -- # that dependency here causes a circular dependency that Kconfig -- # can't see is just spurious. However, that dependency is about -- # the toolchain having sync4 primitives, which is always a given -- # for i386 and x86_64. -- select BR2_PACKAGE_MESA3D_DRI_DRIVER -- select BR2_PACKAGE_LIBDRM_RADEON -- help -- Legacy Radeon driver for R100 series GPUs. -- - comment "Vulkan drivers" - - config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL -@@ -406,17 +350,16 @@ comment "OpenGL API Support" - - config BR2_PACKAGE_MESA3D_GBM - bool "gbm" -- depends on BR2_PACKAGE_MESA3D_DRI_DRIVER \ -- || (BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) -+ depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && \ -+ BR2_PACKAGE_MESA3D_OPENGL_EGL - select BR2_PACKAGE_HAS_LIBGBM - select BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT - select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF - help - Enable Generic Buffer Management (gbm) - --comment "gbm support needs a dri driver or a gallium driver w/ EGL support." -- depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER \ -- && !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) -+comment "gbm support needs a gallium driver w/ EGL support." -+ depends on !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) - - config BR2_PACKAGE_MESA3D_OPENGL_GLX - bool "OpenGL GLX" -@@ -432,7 +375,7 @@ comment "OpenGL GLX support needs X11" - - config BR2_PACKAGE_MESA3D_OPENGL_EGL - bool "OpenGL EGL" -- depends on BR2_PACKAGE_MESA3D_DRI_DRIVER || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER -+ depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND - select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND - select BR2_PACKAGE_HAS_LIBEGL_WAYLAND -diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash -index e36d798e21..ab20063cd9 100644 ---- a/package/mesa3d/mesa3d.hash -+++ b/package/mesa3d/mesa3d.hash -@@ -1,6 +1,5 @@ --# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000660.html --sha256 d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c mesa-21.3.5.tar.xz --sha512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933 mesa-21.3.5.tar.xz -- -+# From https://lists.freedesktop.org/archives/mesa-announce/2022-August/000683.html -+sha256 22ced061eb9adab8ea35368246c1995c09723f3f71653cd5050c5cec376e671a mesa-22.1.6.tar.xz -+sha512 3b2a0bb781c3d540401e6f51e3cf0d87d4e22923b6a5a4ea9d8ce5c79b4a2d5e8b1c237a36325d7d7178448ae102470ebefb312644dc09818cce91fd5439cb07 mesa-22.1.6.tar.xz - # License --sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst -+sha256 4bc15d14dcc134b024cbdca3b5330010136ce8a427b6f8353440ce2ad7aab037 docs/license.rst -diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk -index 5f080ff5fc..0630f43df1 100644 ---- a/package/mesa3d/mesa3d.mk -+++ b/package/mesa3d/mesa3d.mk -@@ -5,7 +5,7 @@ - ################################################################################ - - # When updating the version, please also update mesa3d-headers --MESA3D_VERSION = 21.3.5 -+MESA3D_VERSION = 22.1.6 - MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz - MESA3D_SITE = https://archive.mesa3d.org - MESA3D_LICENSE = MIT, SGI, Khronos -@@ -114,11 +114,6 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA) += tegra - MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D) += v3d - MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4 - MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl --# DRI Drivers --MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915 --MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 --MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau --MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += r100 - # Vulkan Drivers - MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel - -@@ -133,15 +128,6 @@ MESA3D_CONF_OPTS += \ - -Dgallium-extra-hud=true - endif - --ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) --MESA3D_CONF_OPTS += \ -- -Ddri-drivers= --else --MESA3D_CONF_OPTS += \ -- -Dshared-glapi=enabled \ -- -Ddri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) --endif -- - ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) - MESA3D_CONF_OPTS += \ - -Dvulkan-drivers= -diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in -index 428413d5e2..46585e1e04 100644 ---- a/package/qt5/qt5tools/Config.in -+++ b/package/qt5/qt5tools/Config.in -@@ -23,12 +23,13 @@ config BR2_PACKAGE_QT5TOOLS_QDOC_TOOL - # currently supported in Buildroot, unless the target is - # already supported by llvm. - depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm, clang -- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # llvm, clang -+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # llvm, clang - depends on BR2_TOOLCHAIN_HAS_THREADS # llvm, clang - depends on BR2_INSTALL_LIBSTDCPP # llvm, clang - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # llvm, clang - depends on !BR2_STATIC_LIBS # llvm, clang - depends on BR2_USE_WCHAR # llvm, clang -+ depends on BR2_HOST_GCC_AT_LEAST_5 # llvm, clang - help - This option enables the qdoc host tool. - --- -2.34.1 - diff --git a/buildroot-patches/0015-Bump-systemd-to-250.7.patch b/buildroot-patches/0015-Bump-systemd-to-250.7.patch deleted file mode 100644 index a38269f0..00000000 --- a/buildroot-patches/0015-Bump-systemd-to-250.7.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 2083b579304d373a20dd295812a3c6e36e24717a Mon Sep 17 00:00:00 2001 -From: Stefan Agner -Date: Fri, 12 Aug 2022 18:07:44 +0200 -Subject: [PATCH] package/systemd: bump to version 250.7 - -Signed-off-by: Stefan Agner ---- - ...define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch | 33 ------------------- - package/systemd/systemd.hash | 2 +- - package/systemd/systemd.mk | 2 +- - 3 files changed, 2 insertions(+), 35 deletions(-) - delete mode 100644 package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch - -diff --git a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch b/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch -deleted file mode 100644 -index 0934886acb..0000000000 ---- a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch -+++ /dev/null -@@ -1,33 +0,0 @@ --From 16c132a6a0389e0eaea70c4ad95dbfd1637ec5ba Mon Sep 17 00:00:00 2001 --From: Romain Naour --Date: Fri, 7 Jan 2022 22:25:23 +0100 --Subject: [PATCH] missing-syscall: define MOVE_MOUNT_T_EMPTY_PATH if missing -- --MOVE_MOUNT_T_EMPTY_PATH has been added to systemd 250 by [1] --but it's defined in kernel headers since version 5.2. -- --[1] c7bf079bbc19e3b409acc0c7acc3e14749211fe2 -- --Signed-off-by: Romain Naour ----- -- src/basic/missing_syscall.h | 4 ++++ -- 1 file changed, 4 insertions(+) -- --diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h --index 8267b1a90c..793d111c55 100644 ----- a/src/basic/missing_syscall.h --+++ b/src/basic/missing_syscall.h --@@ -569,6 +569,10 @@ static inline int missing_open_tree( -- #define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ -- #endif -- --+#ifndef MOVE_MOUNT_T_EMPTY_PATH --+#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ --+#endif --+ -- static inline int missing_move_mount( -- int from_dfd, -- const char *from_pathname, ---- --2.31.1 -- -diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash -index 3572b25965..75f62e8bef 100644 ---- a/package/systemd/systemd.hash -+++ b/package/systemd/systemd.hash -@@ -1,5 +1,5 @@ - # sha256 locally computed --sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz -+sha256 14348e1a3b2eef01ad62f996757400256008e5f8e655b4ffd5a60e5124e20eee systemd-250.7.tar.gz - sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 - sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 - sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt -diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk -index 14b0b065bc..09e0a7dcc2 100644 ---- a/package/systemd/systemd.mk -+++ b/package/systemd/systemd.mk -@@ -19,7 +19,7 @@ - # - Diff sysusers.d with the previous version - # - Diff factory/etc/nsswitch.conf with the previous version - # (details are often sprinkled around in README and manpages) --SYSTEMD_VERSION = 250.4 -+SYSTEMD_VERSION = 250.7 - SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) - SYSTEMD_LICENSE = \ - LGPL-2.1+, \ diff --git a/buildroot-patches/0015-Fix-deletion-of-headers-by-mesa3d.patch b/buildroot-patches/0015-Fix-deletion-of-headers-by-mesa3d.patch new file mode 100644 index 00000000..27b8d54a --- /dev/null +++ b/buildroot-patches/0015-Fix-deletion-of-headers-by-mesa3d.patch @@ -0,0 +1,25 @@ +From 5eda69438b8f8bcd00865c70d58fdc7916969b60 Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Sat, 3 Dec 2022 17:34:47 +0100 +Subject: [PATCH 1/1] Fix deletion of headers by mesa3d + +--- + package/qt5/qt5webengine/qt5webengine.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk +index 836ba62189..8a0757fccc 100644 +--- a/package/qt5/qt5webengine/qt5webengine.mk ++++ b/package/qt5/qt5webengine/qt5webengine.mk +@@ -7,7 +7,7 @@ + QT5WEBENGINE_VERSION = $(QT5_VERSION) + QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts + QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 +-QT5WEBENGINE_DEPENDENCIES = qt5declarative qt5webchannel ++QT5WEBENGINE_DEPENDENCIES = qt5declarative qt5webchannel xorgproto-mesafix + QT5WEBENGINE_PATCH_DEPENDENCIES = qt5webengine-chromium + QT5WEBENGINE_INSTALL_STAGING = YES + QT5WEBENGINE_SYNC_QT_HEADERS = YES +-- +2.34.1 + diff --git a/buildroot-patches/0016-Bump-rust-to-1.62.0.patch b/buildroot-patches/0016-Bump-rust-to-1.65.0.patch similarity index 59% rename from buildroot-patches/0016-Bump-rust-to-1.62.0.patch rename to buildroot-patches/0016-Bump-rust-to-1.65.0.patch index 90a93b8c..d307ed92 100644 --- a/buildroot-patches/0016-Bump-rust-to-1.62.0.patch +++ b/buildroot-patches/0016-Bump-rust-to-1.65.0.patch @@ -1,19 +1,20 @@ -From 2f084b188e8b9573c6d3fc52aa1f921370f80073 Mon Sep 17 00:00:00 2001 +From 270c96150e0e1bf70a926f328334114a690f4445 Mon Sep 17 00:00:00 2001 From: j1nx -Date: Thu, 15 Sep 2022 17:38:52 +0200 -Subject: [PATCH 1/1] Bump rust to 1.62.0 +Date: Tue, 6 Dec 2022 17:23:41 +0100 +Subject: [PATCH 1/1] Bump rust to 1.65.0 --- - package/rust-bin/rust-bin.hash | 225 ++++++++++++++++++--------------- - package/rust-bin/rust-bin.mk | 2 +- - package/rust/rust.hash | 6 +- - package/rust/rust.mk | 2 +- - package/rustc/Config.in.host | 17 ++- - package/rustc/rustc.mk | 4 +- - 6 files changed, 150 insertions(+), 106 deletions(-) + package/rust-bin/rust-bin.hash | 225 ++++++++++++++++------------ + package/rust-bin/rust-bin.mk | 4 +- + package/rust/rust.hash | 6 +- + package/rust/rust.mk | 4 +- + package/rustc/Config.in.host | 13 +- + package/rustc/rustc.mk | 4 +- + support/download/cargo-post-process | 26 +++- + 7 files changed, 169 insertions(+), 113 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash -index 9f8788a295..57ff4ee1a8 100644 +index 9f8788a295..af9927a028 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,102 +1,129 @@ @@ -116,177 +117,181 @@ index 9f8788a295..57ff4ee1a8 100644 -# From https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz.asc -sha256 b0d3e03c9b1eff6e241383913b02653ba80776626ca7c4a93f36c2ad829ba989 rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz -+# From https://static.rust-lang.org/dist/rust-1.62.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-1.62.0-aarch64-unknown-linux-gnu.tar.xz.asc -+sha256 596edf892fac02f3a3b9a8f018f64551e2d58f0a840a8bad13793eb7224783bd rust-1.62.0-aarch64-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-1.62.0-i686-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-1.62.0-i686-unknown-linux-gnu.tar.xz.asc -+sha256 8851657b282e0b76056b4179c5f2c77f0624da9e031a4dab1abb33be7c251238 rust-1.62.0-i686-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-1.62.0-mips-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-1.62.0-mips-unknown-linux-gnu.tar.xz.asc -+sha256 3d1baf0f8aa8615dff16870b86db1d52df5875005c08626aec81cb98b0de5ce6 rust-1.62.0-mipsel-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-1.62.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-1.62.0-mipsel-unknown-linux-gnu.tar.xz.asc -+sha256 e053f1ff5e60c5c4c7db5e507a79b53230b8c78e71dcd47cffa5bc4ad946244a rust-1.62.0-mips-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-1.62.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-1.62.0-powerpc-unknown-linux-gnu.tar.xz.asc -+sha256 a82296609a6606764f074395454e7223a152c39f3506f481900fbeebd3de00b7 rust-1.62.0-powerpc64le-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-1.62.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-1.62.0-powerpc64-unknown-linux-gnu.tar.xz.asc -+sha256 abd61a8009369d40b646b7803cbd91f0dc1b62d09c9c48e8d5b0a2b3c570076e rust-1.62.0-powerpc64-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-1.62.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-1.62.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -+sha256 9aa91e10bbb6e31edb435d7f9da97e837f883ad6790d44b830db435b313e0598 rust-1.62.0-powerpc-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-1.62.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-1.62.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -+sha256 ffd184bcc19fce389d4d09805b6b2e5e4657055fc1e2c088cd0ccb9420a63e09 rust-1.62.0-riscv64gc-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-1.62.0-s390x-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-1.62.0-s390x-unknown-linux-gnu.tar.xz.asc -+sha256 b86406f051d95fc8b63a5699cf235313e4fcc4bb382aaf6fc9b8d4d19d5ccfd7 rust-1.62.0-s390x-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-1.62.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-1.62.0-x86_64-unknown-linux-gnu.tar.xz.asc -+sha256 29d0cb095bc006f82fb99bc4b9081aff813d803426ef01c9d1bd2b150e68d035 rust-1.62.0-x86_64-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-aarch64-unknown-linux-gnu.tar.xz.asc -+sha256 dd5df8a92af3e5d49a1122b9561821ebd72a9317884a37ecddae041e652a7563 rust-std-1.62.0-aarch64-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-aarch64-unknown-linux-musl.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-aarch64-unknown-linux-musl.tar.xz.asc -+sha256 8098164090a4625f5d7caebce3475b50424689f5ca849cecfc341ce6b7f569e1 rust-std-1.62.0-aarch64-unknown-linux-musl.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-arm-unknown-linux-gnueabi.tar.xz.asc -+sha256 e6a96d682b86b142ad2157c485db6d3cf0fb709766a7a42126c06b492b8f984f rust-std-1.62.0-arm-unknown-linux-gnueabi.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-arm-unknown-linux-gnueabihf.tar.xz.asc -+sha256 dd41407aed1357a10eeaef7db87551e54d7b7249fd502c2e8bdefc506ec38773 rust-std-1.62.0-arm-unknown-linux-gnueabihf.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-arm-unknown-linux-musleabihf.tar.xz.asc -+sha256 5175ea9f4115e47868e458bcc11f0708ae0361e1d1555a763f3ee0d13ab137e1 rust-std-1.62.0-arm-unknown-linux-musleabihf.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-arm-unknown-linux-musleabi.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-arm-unknown-linux-musleabi.tar.xz.asc -+sha256 0dc65434e4cc42619d59064eaa996c098fe246b87e030a7f34baf4e5500ef374 rust-std-1.62.0-arm-unknown-linux-musleabi.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -+sha256 74326d0823d0c1d06139ebe743926bf0afaf171bcd3c8be1c009164d0d3dc22f rust-std-1.62.0-armv5te-unknown-linux-gnueabi.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-armv5te-unknown-linux-musleabi.tar.xz.asc -+sha256 ef0eec674a40192c4199d5a4d1a4c35d367941d01bb544eb2c0279d3be7c0b21 rust-std-1.62.0-armv5te-unknown-linux-musleabi.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -+sha256 dadb345cf8b0bdf5bc6f4b34191230cae482e49c414e97096291ad34e7aee937 rust-std-1.62.0-armv7-unknown-linux-gnueabihf.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-armv7-unknown-linux-gnueabi.tar.xz.asc -+sha256 cbfecfaf88aa8b7ff83d7d26fc4be70e9faf33e58435559668bdaa49a6db749e rust-std-1.62.0-armv7-unknown-linux-gnueabi.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-armv7-unknown-linux-musleabihf.tar.xz.asc -+sha256 dda7e758957031394b2efc160ff95c4b67618ab92431db94f2235f8d3d676e60 rust-std-1.62.0-armv7-unknown-linux-musleabihf.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-armv7-unknown-linux-musleabi.tar.xz.asc -+sha256 5ceb10f3b6a5cc4635b7bf9fcdd4ea52d473ef7a14a879c4e1d40a5478db434e rust-std-1.62.0-armv7-unknown-linux-musleabi.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-i586-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-i586-unknown-linux-gnu.tar.xz.asc -+sha256 b02376bb781bb9e9e4baa36ab25f62a5bb0f39e11ab9fa3e07e716e1802c11db rust-std-1.62.0-i586-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-i586-unknown-linux-musl.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-i586-unknown-linux-musl.tar.xz.asc -+sha256 7b2289cd0a6eea72217db6fbdf3901aeff134c7df09273452f26e7234b01a4d8 rust-std-1.62.0-i586-unknown-linux-musl.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-i686-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-i686-unknown-linux-gnu.tar.xz.asc -+sha256 e8bd12367b638db3146fd886e75957ba9f7ee9b15f81d32e7e2fa225d6e4678c rust-std-1.62.0-i686-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-i686-unknown-linux-musl.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-i686-unknown-linux-musl.tar.xz.asc -+sha256 c23526b15c1933651c1e9cb1c3ccaba3926084b8a579f3cf710e0204e4b8cdf2 rust-std-1.62.0-i686-unknown-linux-musl.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-mips-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-mips-unknown-linux-gnu.tar.xz.asc -+sha256 23cdca023a5786054a5c2c89f6cac446cad0de5f9fe24a448822880f7035fda9 rust-std-1.62.0-mips-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-mips-unknown-linux-musl.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-mips-unknown-linux-musl.tar.xz.asc -+sha256 0da7f636d8cc3e18f3f57cb38f08213dfd26f2ef76c27b14b4b46dc301d55a81 rust-std-1.62.0-mips-unknown-linux-musl.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -+sha256 705b161f8f394274816e5ae0836cad511d40410254ef26c37316343061f52a5d rust-std-1.62.0-mips64-unknown-linux-gnuabi64.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-mips64-unknown-linux-muslabi64.tar.xz.asc -+sha256 e7bc3eb22f5d2d51855a0fab9054d585705ce339bf99da49db8456d5c99c91b4 rust-std-1.62.0-mips64-unknown-linux-muslabi64.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -+sha256 f191282613e91e574dfd82981b4262562ecad66fca4ec729a5f9d5769212a083 rust-std-1.62.0-mips64el-unknown-linux-gnuabi64.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -+sha256 336a933f2b94ed335e87946b26338f8bc6cc490632f35cb7502303d8158f99ec rust-std-1.62.0-mips64el-unknown-linux-muslabi64.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-mipsel-unknown-linux-gnu.tar.xz.asc -+sha256 c2aa2024a0ac197f9dc1f26c773c451416e25dd0afae1a29a58f5aa88cc669ff rust-std-1.62.0-mipsel-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-mipsel-unknown-linux-musl.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-mipsel-unknown-linux-musl.tar.xz.asc -+sha256 7d469e5a0008e2711e63970dbc48019956da9cd6a5da64e205e7f8df92d2ea6f rust-std-1.62.0-mipsel-unknown-linux-musl.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-powerpc-unknown-linux-gnu.tar.xz.asc -+sha256 0dfd8702568a2a698de0dac43f331a14f3f9d04d4377a9add6f51d416d4ca065 rust-std-1.62.0-powerpc-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-powerpc64-unknown-linux-gnu.tar.xz.asc -+sha256 f086527b059c86c157753e31f1fcdfb2a4ea27eb7d600789cf5f5c364aefab84 rust-std-1.62.0-powerpc64-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -+sha256 d6678b7c971f3adbe7f820adae669d03a314468441e2907747c76eca98e0be92 rust-std-1.62.0-powerpc64le-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -+sha256 ed29711e2146de8b75f5988b46ee2fcf672b3a174e0b91b71d95e52b31df4acf rust-std-1.62.0-riscv64gc-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-s390x-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-s390x-unknown-linux-gnu.tar.xz.asc -+sha256 4fb8a683db726012b443d5ce8737f758ca798aa0522f7acd0d78a5593bc5954f rust-std-1.62.0-s390x-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-sparc64-unknown-linux-gnu.tar.xz.asc -+sha256 8357490e7746b446eb53cd864d0322bfd4147578becbc8898daccd2155f7bd18 rust-std-1.62.0-sparc64-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-x86_64-unknown-linux-gnu.tar.xz.asc -+sha256 addfae87b6b1b521d98a50fdc5120990888a51bb397100062e9c558267c67c77 rust-std-1.62.0-x86_64-unknown-linux-gnu.tar.xz -+# From https://static.rust-lang.org/dist/rust-std-1.62.0-x86_64-unknown-linux-musl.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rust-std-1.62.0-x86_64-unknown-linux-musl.tar.xz.asc -+sha256 1280847d3026276d0c511fb42d81bf8c39f01b87bb19bda4248386e35b86aed0 rust-std-1.62.0-x86_64-unknown-linux-musl.tar.xz ++# From https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc ++sha256 b3a83a9585b8c4ede4eab2a11b3f96895f676d8b46c9642140c4fefd5c309ed1 rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.asc ++sha256 50595b96f98e0940bbfe00209d6c233e9158e140ecd6088ad3bd53f89b123e9d rust-1.65.0-i686-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.asc ++sha256 afa3af620b3a0bf8a1da33413eace1db681db5f99b2572ac016027b3d71a50b7 rust-1.65.0-mips-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc ++sha256 c6b48026fb131a404bcdc7a691246c3de716e32805d58d1571e253b9a5b047b5 rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc ++sha256 5601b31290790a7077c342c8731bb1d5de1a89639476e14bc7840aeaa3ab6010 rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc ++sha256 8cf900ac125d6bebc97ebb777761923b2062e4fc36692c1f2d68faa0e70949b2 rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ++sha256 e0654c20446aa5c66def122617f3ca4be9e9b86e75040327e3d35973b6b88980 rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ++sha256 f02e1bac01415e101fac58608b070b0f37c7df1a142c8001ddbc489cfb85c232 rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc ++sha256 e7dc9bb42c0e738f68f8ad4b05cf4b7bef8fa490c379e5730c7e282507b305ee rust-1.65.0-s390x-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc ++sha256 9455cab767f7b9f46259aac8d953f15f11b3d65513384e2b0a5e77d0432ae82f rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc ++sha256 735b681c8a6e60925c76d6cc899e78b4cb4562ada24a1f265b2021c1faad78ad rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz.asc ++sha256 9ea488da40c347826cce7e238847c745ee566254bb1d077412673f8243fb1cd2 rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz.asc ++sha256 c8793e77ef43336bc372a7a5b4720d5449e92577c7875471c2bc40ddbfde4811 rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.asc ++sha256 f7d5eb17dbe46ee9d3c4f9fcffc07b8e3311c747545402c8d3b5c43043f27288 rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz.asc ++sha256 32d7f301196d73027fb9a5ae595dbadacdc234307c36b4a175a132e75318e38c rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz.asc ++sha256 453a1443e4753611dc4e6969e50ad8d7984a31d1a457729a860599ed19b1de7a rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz.asc ++sha256 d079e841be640b4ce26aa821f29bc813243a7c0af7b8aca8ca4acf5c2e5b722f rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz.asc ++sha256 1d11ab1d60070ae30ff87b55dca077f4d532d814a9ab7bc77055b5b429a78c6e rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ++sha256 fec73401941bffce3b6913d31955f1291119dea119c0051d94f271ae7c959d4c rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz.asc ++sha256 c14268337c69650a2618909d8e691489385d748374d73ab8d6a2f9d6b030d70d rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz.asc ++sha256 9368527053c4bab0fd320209b45f0278d0a1e54a37006a56a6e565404ab73fef rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz.asc ++sha256 0b5bc219333e3e983fb1e7e86a0c268c4a52ccbd6326a16785be9d9017d97e9f rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz.asc ++sha256 533eda439eb5ffec258b8219445742d6d60570040b3ff167291e3d0d985b9d70 rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-musl.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-musl.tar.xz.asc ++sha256 7f5d9ae65827aef1a51676927a4c9533f942021d2fd45fd93b23dfaa738ee205 rust-std-1.65.0-i586-unknown-linux-musl.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz.asc ++sha256 99bd62d593a6ab3205cab7f06b5793a075b9d05d868e927a6948e46269d61e82 rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-musl.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-musl.tar.xz.asc ++sha256 644a4c57c1392f776c5ebb13f9832778b69464391b3766e6bbd18c3aa11787a6 rust-std-1.65.0-i686-unknown-linux-musl.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz.asc ++sha256 50c65a8effc85aa89242ba0a2a2c89bfcc4d0a39dcb42396d10b0036b9a4e90c rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-musl.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-musl.tar.xz.asc ++sha256 3bc5043f4eb7bb6418708792ee8e777197e562d03843a9adf62ce245ba07289a rust-std-1.65.0-mips-unknown-linux-musl.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ++sha256 338c702b79dac33e32dde097084dd38852487d2976c5eb66b44ba8fc8319342b rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz.asc ++sha256 9450745a5e678c9b7e65ecc7d6a016f92d8d22d8091c4a77431b1e58b99a435f rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc ++sha256 a0a0e60a0e850140194250fbbfb962c322d4f474f4ec22d03b7f537034257c09 rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz.asc ++sha256 0862706d22dcfee39b0d2df874dd6065d8c3020c0b8974f6e7b694edd42413ae rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc ++sha256 79e078420f7c45fd1cf38b70620ced50d35ddb1621736b65be987c20481fe5bc rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz.asc ++sha256 482e9245873338a08f47ea2c29683134b8813deb3e3eafb78b786d34bbecce51 rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc ++sha256 672b9ea8018dcdf7d5f79f5298bacc34e7600a082727b4f1a20c14251752aaa2 rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc ++sha256 8a26e08908156ae5a05c64c2732435ef4efb994a2ac6d0b2e9c93c0dae19d089 rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ++sha256 ce18b44300f7d5d94856cef5b270ba010061fafa411beb9782207e26cbab88a6 rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ++sha256 fa99f123ce14f1cda245857b50fd4709adee960e7d36ce663b87c13aee18b64b rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc ++sha256 a3f6740be345364f4599ae837d2401e0f31e5d33a4f958852d12a384ee581a83 rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz.asc ++sha256 fc2a8816665f464d3085dcd379c44b9de0ee1f1084fae0a4c32c57754b27992b rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc ++sha256 2b588cd2d49688c0c33b7466614123e8fe4c910f4d802fc0ff0662b1772816a9 rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz ++# From https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc ++sha256 55abeb1b55aeebc46a4af2f304271361397df58d12f7eb23fb262bc3132c6056 rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk -index d4cb8f50ea..6395143655 100644 +index d4cb8f50ea..91ee5a5372 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk -@@ -4,7 +4,7 @@ +@@ -4,7 +4,9 @@ # ################################################################################ -RUST_BIN_VERSION = 1.58.1 -+RUST_BIN_VERSION = 1.62.0 ++# When updating this version, check whether support/download/cargo-post-process ++# still generates the same archives. ++RUST_BIN_VERSION = 1.65.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash -index 7eb8f59603..fe065ff7d1 100644 +index 7eb8f59603..9776f3f84c 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.58.1-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.58.1-src.tar.xz.asc -sha256 2b3643a48e7087053b0268971ec4154350342508922a8acb0707aaf94deb4469 rustc-1.58.1-src.tar.xz -+# From https://static.rust-lang.org/dist/rustc-1.62.0-src.tar.xz.sha256 -+# Verified using https://static.rust-lang.org/dist/rustc-1.62.0-src.tar.xz.asc -+sha256 6c00ef115c894c2645e60b5049a4f5dacf1dc0c993f3074f7ae4fdf4c755dd5e rustc-1.62.0-src.tar.xz ++# From https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.sha256 ++# Verified using https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.asc ++sha256 2d6aa2ea3fedd55acbbd65f78349385f9daa9c14e25db7a8df5d015588eee1cf rustc-1.65.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk -index cbd4786f06..9d7335637c 100644 +index cbd4786f06..d501391d77 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk -@@ -4,7 +4,7 @@ +@@ -4,7 +4,9 @@ # ################################################################################ -RUST_VERSION = 1.58.1 -+RUST_VERSION = 1.62.0 ++# When updating this version, check whether support/download/cargo-post-process ++# still generates the same archives. ++RUST_VERSION = 1.65.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host -index 13b866345b..822de68dbb 100644 +index d647ae69b2..822de68dbb 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -1,7 +1,16 @@ @@ -316,22 +321,6 @@ index 13b866345b..822de68dbb 100644 # x86_64-unknown-linux-musl default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_MUSL -@@ -99,11 +110,15 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS - default y if BR2_sparc64 && BR2_TOOLCHAIN_USES_GLIBC - - # All target rust packages should depend on this option -+# Note: With musl based toolchain, we need a C++ cross compiler to -+# build host-rust some target libraries (libunwind) from llvm source -+# code bundled in rust sources. - config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - bool - default y if BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS - default y if BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS - default y if BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS -+ depends on BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_MUSL - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS - - config BR2_PACKAGE_HOST_RUSTC_ARCH diff --git a/package/rustc/rustc.mk b/package/rustc/rustc.mk index 0513dd0b40..b2cc131ee9 100644 --- a/package/rustc/rustc.mk @@ -347,6 +336,54 @@ index 0513dd0b40..b2cc131ee9 100644 RUSTC_HOST_ARCH = i686 else RUSTC_HOST_ARCH = $(HOSTARCH) +diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process +index a4a4718a2a..186e9eb69b 100755 +--- a/support/download/cargo-post-process ++++ b/support/download/cargo-post-process +@@ -1,6 +1,7 @@ + #!/usr/bin/env bash + + set -e ++set -o pipefail + + . "${0%/*}/helpers" + +@@ -22,17 +23,28 @@ post_process_unpack "${base_name}" "${output}" + + # Do the Cargo vendoring + pushd "${base_name}" > /dev/null +-cargo vendor --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} --locked VENDOR + + # Create the local .cargo/config with vendor info ++# ++# The first line of the output to stdout is empty. ++# So skip it to have the file start with the vendoring ++# configuration (`tail --lines=+2`). ++# ++# NOTE: ++# There is a patch for cargo to remove the first empty line: ++# See: https://github.com/rust-lang/cargo/pull/11273 ++# ++# The patch already landed in +nightly and will end up ++# in +stable soon. ++# ++# -> When updating rust/cargo, the call to `tail` must be removed. ++# + mkdir -p .cargo/ +-cat <.cargo/config +-[source.crates-io] +-replace-with = "vendored-sources" ++cargo vendor \ ++ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ ++ --locked VENDOR \ ++ | tail --lines=+2 | tee .cargo/config + +-[source.vendored-sources] +-directory = "VENDOR" +-EOF + popd > /dev/null + + post_process_repack "$(pwd)" "${base_name}" "${output}" -- 2.34.1 diff --git a/buildroot-patches/0018-Bump-libabseil-cpp-to-20220623.1.patch b/buildroot-patches/0018-Bump-libabseil-cpp-to-20220623.1.patch new file mode 100644 index 00000000..4f3896c0 --- /dev/null +++ b/buildroot-patches/0018-Bump-libabseil-cpp-to-20220623.1.patch @@ -0,0 +1,168 @@ +From 3ca02990087e43616662dbda4d9dea5dc9bca4ba Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Fri, 25 Nov 2022 20:30:39 +0100 +Subject: [PATCH 1/1] Bump libabseil-cpp to 20220623.1 + +--- + .../0002-fix-build-with-uclibc-ng.patch | 62 ------------------- + ...direct_mmap-h-fix-musl-build-on-mips.patch | 55 ---------------- + package/libabseil-cpp/libabseil-cpp.hash | 2 +- + package/libabseil-cpp/libabseil-cpp.mk | 2 +- + 4 files changed, 2 insertions(+), 119 deletions(-) + delete mode 100644 package/libabseil-cpp/0002-fix-build-with-uclibc-ng.patch + delete mode 100644 package/libabseil-cpp/0003-PR-1197-absl-base-internal-direct_mmap-h-fix-musl-build-on-mips.patch + +diff --git a/package/libabseil-cpp/0002-fix-build-with-uclibc-ng.patch b/package/libabseil-cpp/0002-fix-build-with-uclibc-ng.patch +deleted file mode 100644 +index 0797d8e51b..0000000000 +--- a/package/libabseil-cpp/0002-fix-build-with-uclibc-ng.patch ++++ /dev/null +@@ -1,62 +0,0 @@ +-From b9ad9bbfed92199a1a58504306d026cd2597539e Mon Sep 17 00:00:00 2001 +-From: Fabrice Fontaine +-Date: Wed, 30 Mar 2022 21:56:20 +0200 +-Subject: [PATCH] Fix build with uclibc-ng (#1145) +- +-uclibc-ng doesn't provide getauxval which results in the following build +-failure on arm or ppc with any user of abseil-cpp such as grpc: +- +-/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_random_internal_randen_hwaes.so.2111.0.0: undefined reference to `getauxval' +- +-To fix this build failure, check that __UCLIBC__ is not defined before +-using getauxval (as Babel is not able to check function availability) +- +-Fixes: +- - http://autobuild.buildroot.org/results/775f3ca3dedebff29e212b29dfa896b7613b7a02 +- +-Signed-off-by: Fabrice Fontaine +-[Retrieved from: +-https://github.com/abseil/abseil-cpp/commit/b9ad9bbfed92199a1a58504306d026cd2597539e] +---- +- absl/debugging/internal/vdso_support.cc | 2 +- +- absl/random/internal/randen_detect.cc | 7 ++++++- +- 2 files changed, 7 insertions(+), 2 deletions(-) +- +-diff --git a/absl/debugging/internal/vdso_support.cc b/absl/debugging/internal/vdso_support.cc +-index c655cf452..e63ac4a3b 100644 +---- a/absl/debugging/internal/vdso_support.cc +-+++ b/absl/debugging/internal/vdso_support.cc +-@@ -33,7 +33,7 @@ +- #endif +- #include +- +--#if defined(__GLIBC__) && \ +-+#if !defined(__UCLIBC__) && defined(__GLIBC__) && \ +- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) +- #define ABSL_HAVE_GETAUXVAL +- #endif +-diff --git a/absl/random/internal/randen_detect.cc b/absl/random/internal/randen_detect.cc +-index 9bb58fc68..6dababa35 100644 +---- a/absl/random/internal/randen_detect.cc +-+++ b/absl/random/internal/randen_detect.cc +-@@ -24,6 +24,11 @@ +- +- #include "absl/random/internal/platform.h" +- +-+#if !defined(__UCLIBC__) && defined(__GLIBC__) && \ +-+ (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) +-+#define ABSL_HAVE_GETAUXVAL +-+#endif +-+ +- #if defined(ABSL_ARCH_X86_64) +- #define ABSL_INTERNAL_USE_X86_CPUID +- #elif defined(ABSL_ARCH_PPC) || defined(ABSL_ARCH_ARM) || \ +-@@ -31,7 +36,7 @@ +- #if defined(__ANDROID__) +- #define ABSL_INTERNAL_USE_ANDROID_GETAUXVAL +- #define ABSL_INTERNAL_USE_GETAUXVAL +--#elif defined(__linux__) +-+#elif defined(__linux__) && defined(ABSL_HAVE_GETAUXVAL) +- #define ABSL_INTERNAL_USE_LINUX_GETAUXVAL +- #define ABSL_INTERNAL_USE_GETAUXVAL +- #endif +diff --git a/package/libabseil-cpp/0003-PR-1197-absl-base-internal-direct_mmap-h-fix-musl-build-on-mips.patch b/package/libabseil-cpp/0003-PR-1197-absl-base-internal-direct_mmap-h-fix-musl-build-on-mips.patch +deleted file mode 100644 +index 0f77236843..0000000000 +--- a/package/libabseil-cpp/0003-PR-1197-absl-base-internal-direct_mmap-h-fix-musl-build-on-mips.patch ++++ /dev/null +@@ -1,55 +0,0 @@ +-From 53a90f079af7ab491530d432bb318a95371ba877 Mon Sep 17 00:00:00 2001 +-From: Fabrice Fontaine +-Date: Thu, 16 Jun 2022 14:28:53 -0700 +-Subject: [PATCH] PR #1197: absl/base/internal/direct_mmap.h: fix musl build on +- mips +- +-Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1197 +- +-Fix the following musl build failure on mips: +- +-``` +-In file included from /nvmedata/autobuild/instance-15/output-1/build/libabseil-cpp-20211102.0/absl/base/internal/low_level_alloc.cc:26: +-/nvmedata/autobuild/instance-15/output-1/build/libabseil-cpp-20211102.0/absl/base/internal/direct_mmap.h:49:10: fatal error: sgidefs.h: No such file or directory +- 49 | #include +- | ^~~~~~~~~~~ +-``` +- +-Fixes: +- - http://autobuild.buildroot.org/results/3fa027e602bacb22316fb5d9b233baa0b0f0e845 +- +-Signed-off-by: Fabrice Fontaine +-Merge c9b5b5c5471213a871f7d6d1d2fc8f6899effbac into a184bab83ffcffc2aaac49a3900361158ab3890f +- +-Merging this change closes #1197 +- +-COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1197 from ffontaine:master c9b5b5c5471213a871f7d6d1d2fc8f6899effbac +-PiperOrigin-RevId: 455467767 +-Change-Id: I1905f7d70e914288bc1524a52adce3476a779fd8 +- +-[Retrieved from: +-https://github.com/abseil/abseil-cpp/commit/53a90f079af7ab491530d432bb318a95371ba877] +---- +- absl/base/internal/direct_mmap.h | 4 ++-- +- 1 file changed, 2 insertions(+), 2 deletions(-) +- +-diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h +-index a01d61220..e492bb004 100644 +---- a/absl/base/internal/direct_mmap.h +-+++ b/absl/base/internal/direct_mmap.h +-@@ -41,13 +41,13 @@ +- +- #ifdef __mips__ +- // Include definitions of the ABI currently in use. +--#ifdef __BIONIC__ +-+#if defined(__BIONIC__) || !defined(__GLIBC__) +- // Android doesn't have sgidefs.h, but does have asm/sgidefs.h, which has the +- // definitions we need. +- #include +- #else +- #include +--#endif // __BIONIC__ +-+#endif // __BIONIC__ || !__GLIBC__ +- #endif // __mips__ +- +- // SYS_mmap and SYS_munmap are not defined in Android. +diff --git a/package/libabseil-cpp/libabseil-cpp.hash b/package/libabseil-cpp/libabseil-cpp.hash +index 2d6c598880..808bdbab29 100644 +--- a/package/libabseil-cpp/libabseil-cpp.hash ++++ b/package/libabseil-cpp/libabseil-cpp.hash +@@ -1,3 +1,3 @@ + # Locally computed +-sha256 dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4 libabseil-cpp-20211102.0.tar.gz ++sha256 91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8 libabseil-cpp-20220623.1.tar.gz + sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE +diff --git a/package/libabseil-cpp/libabseil-cpp.mk b/package/libabseil-cpp/libabseil-cpp.mk +index 7c6bda7659..ceda106b7d 100644 +--- a/package/libabseil-cpp/libabseil-cpp.mk ++++ b/package/libabseil-cpp/libabseil-cpp.mk +@@ -4,7 +4,7 @@ + # + ################################################################################ + +-LIBABSEIL_CPP_VERSION = 20211102.0 ++LIBABSEIL_CPP_VERSION = 20220623.1 + LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION)) + LIBABSEIL_CPP_LICENSE = Apache-2.0 + LIBABSEIL_CPP_LICENSE_FILES = LICENSE +-- +2.34.1 + diff --git a/buildroot-patches/0019-Bump-flatbuffers.patch b/buildroot-patches/0019-Bump-flatbuffers.patch new file mode 100644 index 00000000..b7ba96ab --- /dev/null +++ b/buildroot-patches/0019-Bump-flatbuffers.patch @@ -0,0 +1,88 @@ +From 6647d7c66e63fb7b498679e967a2900c74628819 Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Tue, 29 Nov 2022 17:02:20 +0100 +Subject: [PATCH 1/1] Bump flatbuffers + +--- + ...flatbuffers-base.h-fix-build-on-musl.patch | 20 +++++++++++-------- + package/flatbuffers/flatbuffers.hash | 2 +- + package/flatbuffers/flatbuffers.mk | 6 ++++-- + 3 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch b/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch +index b4bc0e12de..82feca3e39 100644 +--- a/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch ++++ b/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch +@@ -28,7 +28,10 @@ Fixes: + - http://autobuild.buildroot.org/results/68045b83e94f8caa337b1af7ed5f493ac1a55c47 + + Signed-off-by: Fabrice Fontaine +-[Upstream status: https://github.com/google/flatbuffers/pull/6773] ++[Upstream status: Rejected: ++ https://github.com/google/flatbuffers/pull/6773] ++Signed-off-by: Bernd Kuhls ++(rebased and added fix for uClibc-build) + --- + include/flatbuffers/base.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +@@ -37,15 +40,16 @@ diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h + index de7898dc..101c7598 100644 + --- a/include/flatbuffers/base.h + +++ b/include/flatbuffers/base.h +-@@ -266,7 +266,7 @@ namespace flatbuffers { +- #ifndef FLATBUFFERS_LOCALE_INDEPENDENT +- // Enable locale independent functions {strtof_l, strtod_l,strtoll_l, strtoull_l}. +- #if ((defined(_MSC_VER) && _MSC_VER >= 1800) || \ +-- (defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21)))) +-+ (defined(__GLIBC__) && defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21)))) ++@@ -264,7 +264,8 @@ namespace flatbuffers { ++ // strtoull_l}. ++ #if (defined(_MSC_VER) && _MSC_VER >= 1800) || \ ++ (defined(__ANDROID_API__) && __ANDROID_API__>= 21) || \ ++- (defined(_XOPEN_VERSION) && (_XOPEN_VERSION >= 700)) && \ +++ (defined(_XOPEN_VERSION) && (_XOPEN_VERSION >= 700) && \ +++ defined(__GLIBC__) && !defined(__UCLIBC__)) && \ ++ (!defined(__Fuchsia__) && !defined(__ANDROID_API__)) + #define FLATBUFFERS_LOCALE_INDEPENDENT 1 + #else +- #define FLATBUFFERS_LOCALE_INDEPENDENT 0 + -- + 2.30.2 + +diff --git a/package/flatbuffers/flatbuffers.hash b/package/flatbuffers/flatbuffers.hash +index b05b9e7b4b..6382b86f1b 100644 +--- a/package/flatbuffers/flatbuffers.hash ++++ b/package/flatbuffers/flatbuffers.hash +@@ -1,3 +1,3 @@ + # Locally computed: +-sha256 9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4 flatbuffers-2.0.0.tar.gz ++sha256 f97965a727d26386afaefff950badef2db3ab6af9afe23ed6d94bfb65f95f37e flatbuffers-2.0.8.tar.gz + sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +diff --git a/package/flatbuffers/flatbuffers.mk b/package/flatbuffers/flatbuffers.mk +index 280834c2d4..9d286bf9e1 100644 +--- a/package/flatbuffers/flatbuffers.mk ++++ b/package/flatbuffers/flatbuffers.mk +@@ -4,16 +4,18 @@ + # + ################################################################################ + +-FLATBUFFERS_VERSION = 2.0.0 ++FLATBUFFERS_VERSION = 2.0.8 + FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION)) + FLATBUFFERS_LICENSE = Apache-2.0 + FLATBUFFERS_LICENSE_FILES = LICENSE.txt + FLATBUFFERS_CPE_ID_VENDOR = google + FLATBUFFERS_INSTALL_STAGING = YES ++FLATBUFFERS_DEPENDENCIES = host-flatbuffers + + FLATBUFFERS_CONF_OPTS += \ + -DCMAKE_CXX_FLAGS="-std=c++11" \ +- -DFLATBUFFERS_BUILD_TESTS=OFF ++ -DFLATBUFFERS_BUILD_TESTS=OFF \ ++ -DFLATBUFFERS_FLATC_EXECUTABLE=$(HOST_DIR)/bin/flatc + + ifeq ($(BR2_STATIC_LIBS),y) + FLATBUFFERS_CONF_OPTS += -DFLATBUFFERS_BUILD_SHAREDLIB=OFF +-- +2.34.1 + diff --git a/buildroot-patches/0020-flatbuffers-build-position-independant.patch b/buildroot-patches/0020-flatbuffers-build-position-independant.patch new file mode 100644 index 00000000..2314b382 --- /dev/null +++ b/buildroot-patches/0020-flatbuffers-build-position-independant.patch @@ -0,0 +1,12 @@ +diff --git a/package/flatbuffers/flatbuffers.mk b/package/flatbuffers/flatbuffers.mk +index 9d286bf9e1..487d85ee1f 100644 +--- a/package/flatbuffers/flatbuffers.mk ++++ b/package/flatbuffers/flatbuffers.mk +@@ -14,6 +14,7 @@ FLATBUFFERS_DEPENDENCIES = host-flatbuffers + + FLATBUFFERS_CONF_OPTS += \ + -DCMAKE_CXX_FLAGS="-std=c++11" \ ++ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DFLATBUFFERS_BUILD_TESTS=OFF \ + -DFLATBUFFERS_FLATC_EXECUTABLE=$(HOST_DIR)/bin/flatc +