package/{python-}protobuf: bump to version 28.1
PATCH v2 1/3 package/{python-}protobuf: bump to version 28.1
Migrate protobuf build from autotools to cmake.
Migrate protobuf-python to use pypi sources which are now required for setup.py builds:
https://github.com/protocolbuffers/protobuf/tree/v28.1/python#building-from-setuppy
--- package/criu/Config.in | 2 +- package/kismet/Config.in | 12 +++-- package/mosh/Config.in | 6 +-- package/netdata/Config.in | 6 +-- package/ola/Config.in | 5 ++- package/opencv3/Config.in | 6 +-- package/opencv4/Config.in | 9 +++- package/protobuf/Config.in | 8 ++-- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 46 ++++++++++++++------ package/python-protobuf/python-protobuf.hash | 6 ++- package/python-protobuf/python-protobuf.mk | 5 +-- package/usbguard/Config.in | 2 +- 13 files changed, 74 insertions(+), 41 deletions(-)
package/criu/Config.in +1 -1
@@ -19,7 +19,7 @@ config BR2_PACKAGE_CRIU bool "criu" depends on BR2_PACKAGE_CRIU_ARCH_SUPPORTS depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # -march=armv7-a+fp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # -march=armv7-a+fp, protobuf depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 # rseq.h depends on !BR2_TOOLCHAIN_USES_UCLIBC # no aio.h depends on !BR2_STATIC_LIBS # protobuf, libbsd
package/kismet/Config.in +8 -4
@@ -35,6 +35,7 @@ config BR2_PACKAGE_KISMET_PYTHON_TOOLS bool "Install python tools" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf depends on BR2_PACKAGE_PYTHON3 depends on !BR2_STATIC_LIBS # protobuf depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
@@ -52,26 +53,29 @@ comment "python tools needs python3" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS -comment "python tools needs a glibc or musl toolchain w/ dynamic library" +comment "python tools needs a glibc or musl toolchain w/ dynamic library, gcc >= 8" depends on BR2_STATIC_LIBS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_PACKAGE_KISMET_SERVER bool "Install server" default y depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_USE_WCHAR depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PROTOBUF -comment "server needs a toolchain w/ dynamic library, wchar" +comment "server needs a toolchain w/ dynamic library, wchar, gcc >= 8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 comment "server needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
package/mosh/Config.in +3 -3
@@ -1,7 +1,7 @@ -comment "mosh needs a toolchain w/ C++, threads, dynamic library, wchar, gcc >= 4.8" +comment "mosh needs a toolchain w/ C++, threads, dynamic library, wchar, gcc >= 8" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS config BR2_PACKAGE_MOSH
@@ -9,7 +9,7 @@ config BR2_PACKAGE_MOSH depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf depends on !BR2_STATIC_LIBS # protobuf depends on BR2_USE_WCHAR select BR2_PACKAGE_PROTOBUF
package/netdata/Config.in +3 -3
@@ -23,15 +23,15 @@ config BR2_PACKAGE_NETDATA_PROMETHEUS bool "prometheus remote write backend" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP # protobuf, snappy - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_SNAPPY help Enable prometheus remote write backend -comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 4.8" +comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 8" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS endif
package/ola/Config.in +3 -2
@@ -1,7 +1,7 @@ comment "ola needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS menuconfig BR2_PACKAGE_OLA
@@ -10,7 +10,7 @@ menuconfig BR2_PACKAGE_OLA depends on !BR2_STATIC_LIBS # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID
@@ -35,6 +35,7 @@ config BR2_PACKAGE_OLA_WEB config BR2_PACKAGE_OLA_PYTHON_BINDINGS bool "python bindings" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PROTOBUF help
package/opencv3/Config.in +3 -3
@@ -290,14 +290,14 @@ config BR2_PACKAGE_OPENCV3_WITH_PNG config BR2_PACKAGE_OPENCV3_WITH_PROTOBUF bool "protobuf support" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf select BR2_PACKAGE_PROTOBUF help Use shared protobuf from the target system. -comment "protobuf support needs a toolchain w/ gcc >= 4.8" +comment "protobuf support needs a toolchain w/ gcc >= 8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_PACKAGE_OPENCV3_WITH_TIFF bool "tiff support"
package/opencv4/Config.in +7 -2
@@ -35,14 +35,16 @@ config BR2_PACKAGE_OPENCV4_LIB_DNN # dnn needs fenv.h which is not provided by uclibc depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 select BR2_PACKAGE_OPENCV4_WITH_PROTOBUF help Include opencv_dnn (Deep Neural Networks) module into the OpenCV build. -comment "dnn needs a glibc or musl toolchain" +comment "dnn needs a glibc or musl toolchain, gcc >= 8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_HOST_GCC_AT_LEAST_8 config BR2_PACKAGE_OPENCV4_LIB_FEATURES2D bool "features2d"
@@ -155,6 +157,7 @@ config BR2_PACKAGE_OPENCV4_LIB_OBJDETECT bool "objdetect" depends on !BR2_TOOLCHAIN_USES_UCLIBC # dnn support depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # dnn support + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # dnn support # opencv_core dependency is already enabled select BR2_PACKAGE_OPENCV4_LIB_CALIB3D select BR2_PACKAGE_OPENCV4_LIB_DNN
@@ -204,6 +207,7 @@ config BR2_PACKAGE_OPENCV4_LIB_SHAPE config BR2_PACKAGE_OPENCV4_LIB_STITCHING bool "stitching" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # objdetect + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # objdetect depends on !BR2_TOOLCHAIN_USES_UCLIBC # objdetect select BR2_PACKAGE_OPENCV4_LIB_CALIB3D select BR2_PACKAGE_OPENCV4_LIB_FEATURES2D
@@ -333,6 +337,7 @@ config BR2_PACKAGE_OPENCV4_WITH_PNG config BR2_PACKAGE_OPENCV4_WITH_PROTOBUF bool "protobuf support" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf select BR2_PACKAGE_PROTOBUF help Use shared protobuf from the target system.
package/protobuf/Config.in +5 -3
@@ -37,6 +37,7 @@ config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS default y if BR2_sparc64 default y if BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() config BR2_PACKAGE_PROTOBUF
@@ -44,8 +45,9 @@ config BR2_PACKAGE_PROTOBUF depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBABSEIL_CPP help Protocol buffers are Google's language-neutral, platform-neutral, extensible mechanism for serializing
@@ -53,7 +55,7 @@ config BR2_PACKAGE_PROTOBUF https://developers.google.com/protocol-buffers -comment "protobuf needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" +comment "protobuf needs a toolchain w/ C++, threads, dynamic library, gcc >= 8" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
package/protobuf/protobuf.hash +1 -1
@@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 4eab9b524aa5913c6fffb20b2a8abf5ef7f95a80bc0701f3a6dbb4c607f73460 protobuf-cpp-3.21.12.tar.gz +sha256 3b8bf6e96499a744bd014c60b58f797715a758093abf859f1d902194b8e1f8c9 protobuf-28.1.tar.gz
package/protobuf/protobuf.mk +33 -13
63 lines not on this page · raw message
package/python-protobuf/python-protobuf.hash +4 -2
@@ -1,3 +1,5 @@ -# Locally calculated -sha256 e2b976e67d6fcf7078f799143a73f2a4d9cf3126ca68a1a6f1bda30fe5f3585c protobuf-python-4.21.12.tar.gz +# md5, sha256 from https://pypi.org/pypi/protobuf/json +md5 44b076f3564d3561067bcc2c455e008a protobuf-5.28.1.tar.gz +sha256 42597e938f83bb7f3e4b35f03aa45208d49ae8d5bcb4bc10b9fc825e0ab5e423 protobuf-5.28.1.tar.gz +# Locally computed sha256 checksums sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE
package/python-protobuf/python-protobuf.mk +2 -3
@@ -5,12 +5,11 @@ ################################################################################ PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION) -PYTHON_PROTOBUF_SOURCE = protobuf-python-4.$(PYTHON_PROTOBUF_VERSION).tar.gz -PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE) +PYTHON_PROTOBUF_SOURCE = protobuf-5.$(PYTHON_PROTOBUF_VERSION).tar.gz +PYTHON_PROTOBUF_SITE = https://files.pythonhosted.org/packages/3c/0b/7a997c8939f698d72bdea14d57116e43d3051fffb3b2964c30938c4a08e6 PYTHON_PROTOBUF_LICENSE = BSD-3-Clause PYTHON_PROTOBUF_LICENSE_FILES = LICENSE PYTHON_PROTOBUF_DEPENDENCIES = host-protobuf PYTHON_PROTOBUF_SETUP_TYPE = setuptools -PYTHON_PROTOBUF_SUBDIR = python $(eval $(python-package))
package/usbguard/Config.in +1 -1
@@ -3,7 +3,7 @@ config BR2_PACKAGE_USBGUARD depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS # libqb, protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf, C++17 filesystem depends on !BR2_STATIC_LIBS # libqb, protobuf depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_PROTOBUF
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 2/3 package/libabseil-cpp: bump to version 20240722.0
--- package/libabseil-cpp/libabseil-cpp.hash | 2 +- package/libabseil-cpp/libabseil-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/libabseil-cpp/libabseil-cpp.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed libabseil-cpp-20230802.1.tar.gz +sha256 f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3 libabseil-cpp-20240722.0.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE
package/libabseil-cpp/libabseil-cpp.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBABSEIL_CPP_VERSION = 20230802.1 +LIBABSEIL_CPP_VERSION = 20240722.0 LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION)) LIBABSEIL_CPP_LICENSE = Apache-2.0 LIBABSEIL_CPP_LICENSE_FILES = LICENSE
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Petazzoni via buildroot
AppliedRe: [Buildroot] [PATCH v2 2/3] package/libabseil-cpp: bump to version 20240722.0
Quoted 5 lines · On Mon, 23 Sep 2024 20:39:18 -0600 James Hilliard <[email protected]>…
Signed-off-by James Hilliard <[email protected]>--- package/libabseil-cpp/libabseil-cpp.hash | 2 +- package/libabseil-cpp/libabseil-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 3/3 package/grpc: bump to version 1.66.1
In reply to James HilliardAdd new -DgRPC_BUILD_CODEGEN=OFF config option which is required if no plugins are enabled.
Drop no longer relevant add GPR_DISABLE_WRAPPED_MEMCPY patch.
Rebase remaining patches.
---
.checkpackageignore | 3 +-
...the-availability-of-pthread_setname_.patch | 26 ++---
...trict-building-of-host-grpc-to-grpc.patch} | 98 ++++++++-----------
...py.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch | 34 -------
...conditionally-downloading-api-repos.patch} | 21 ++--
package/grpc/grpc.hash | 2 +-
package/grpc/grpc.mk | 3 +-
7 files changed, 68 insertions(+), 119 deletions(-)
rename package/grpc/{0003-host-grpc-only-cpp-plugin.patch => 0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch} (63%)
delete mode 100644 package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch
rename package/grpc/{0004-disable-unconditionally-downloading-api-repos.patch => 0003-disable-unconditionally-downloading-api-repos.patch} (62%).checkpackageignore +1 -2
@@ -568,8 +568,7 @@ package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch. package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch lib_patch.Upstream -package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch lib_patch.Upstream -package/grpc/0004-disable-unconditionally-downloading-api-repos.patch lib_patch.Upstream +package/grpc/0003-disable-unconditionally-downloading-api-repos.patch lib_patch.Upstream package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch lib_patch.Upstream package/guile/0001-calculate-csqrt_manually.patch lib_patch.Upstream package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch lib_patch.Upstream
package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch +13 -13
@@ -1,4 +1,4 @@ -From 0dfb289a3b362b082ac3608d887e42f09dadc0d2 Mon Sep 17 00:00:00 2001 +From dfec50b899c449bc964514f16e94869de7a68896 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <[email protected]> Date: Mon, 31 Dec 2018 16:22:07 +0100 Subject: [PATCH] Properly detect the availability of pthread_setname_np()
@@ -20,15 +20,15 @@ Signed-off-by: Thomas Petazzoni <[email protected]> ] Signed-off-by: Michael Nosthoff <[email protected]> --- - CMakeLists.txt | 6 ++++++ - include/grpc/impl/codegen/port_platform.h | 2 ++ + CMakeLists.txt | 6 ++++++ + include/grpc/support/port_platform.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45c2fcb..0b2be4f 100644 +index 053b9e3784..2565dc5c84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -208,6 +208,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) +@@ -291,6 +291,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
@@ -41,11 +41,11 @@ index 45c2fcb..0b2be4f 100644 if(MSVC) include(cmake/msvc_static_runtime.cmake) add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) -diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h -index 4f213ff..55ecd9d 100644 ---- a/include/grpc/impl/codegen/port_platform.h -+++ b/include/grpc/impl/codegen/port_platform.h -@@ -186,6 +186,7 @@ +diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h +index 5fb7426af2..24d438d702 100644 +--- a/include/grpc/support/port_platform.h ++++ b/include/grpc/support/port_platform.h +@@ -228,6 +228,7 @@ #endif /* _LP64 */ #ifdef __GLIBC__ #define GPR_POSIX_CRASH_HANDLER 1
@@ -53,7 +53,7 @@ index 4f213ff..55ecd9d 100644 #ifdef __GLIBC_PREREQ #if __GLIBC_PREREQ(2, 12) #define GPR_LINUX_PTHREAD_NAME 1 -@@ -194,6 +195,7 @@ +@@ -236,6 +237,7 @@ // musl libc & others #define GPR_LINUX_PTHREAD_NAME 1 #endif
@@ -61,6 +61,6 @@ index 4f213ff..55ecd9d 100644 #include <linux/version.h> #else /* musl libc */ #define GPR_MUSL_LIBC_COMPAT 1 - -- -2.26.63 +2.34.1 +
package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch renamed from package/grpc/0003-host-grpc-only-cpp-plugin.patch +41 -57
216 lines not on this page · raw message
package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From be030314805137cd63b46ea6eaa702b608669910 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Sun, 2 Jun 2019 17:45:47 +0200 -Subject: [PATCH] wrap_memcpy.cc: add GPR_DISABLE_WRAPPED_MEMCPY - -Add GPR_DISABLE_WRAPPED_MEMCPY to allow the user to disable wrapped -memcpy. This will fix build on x86_64 on musl/uclibc without changing -the cpu behavior. - -Fixes: - - http://autobuild.buildroot.org/results/20d6f2489a4e291a53bd514da66105eb607e1014 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Upstream status: https://github.com/grpc/grpc/pull/19207] ---- - src/core/lib/gpr/wrap_memcpy.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/lib/gpr/wrap_memcpy.cc b/src/core/lib/gpr/wrap_memcpy.cc -index 9b8608e056..38b76acf95 100644 ---- a/src/core/lib/gpr/wrap_memcpy.cc -+++ b/src/core/lib/gpr/wrap_memcpy.cc -@@ -29,7 +29,7 @@ - extern "C" { - #ifdef __linux__ - #if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT) && \ -- !defined(__ANDROID__) -+ !defined(__ANDROID__) && !defined(GPR_DISABLE_WRAPPED_MEMCPY) - __asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); - void* __wrap_memcpy(void* destination, const void* source, size_t num) { - return memcpy(destination, source, num); --- -2.20.1 -
package/grpc/0003-disable-unconditionally-downloading-api-repos.patch renamed from package/grpc/0004-disable-unconditionally-downloading-api-repos.patch +10 -11
@@ -1,4 +1,4 @@ -From b0599c3d1b52818c79ea8fa5dfdc40a4ce01e454 Mon Sep 17 00:00:00 2001 +From 2a73f6439b6d745b2cbfff120dc7adc555400247 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff <[email protected]> Date: Fri, 22 Jul 2022 08:49:48 +0200 Subject: [PATCH] disable unconditionally downloading api repos
@@ -9,31 +9,30 @@ for now. See https://github.com/grpc/grpc/issues/30385 Signed-off-by: Michael Nosthoff <[email protected]> - --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 11e7ae2b67..a9062fa6ef 100644 +index 94f8fd3e93..df43d2e193 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -327,6 +327,7 @@ include(cmake/xxhash.cmake) - include(cmake/zlib.cmake) - include(cmake/download_archive.cmake) +@@ -402,6 +402,7 @@ if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN) + include(cmake/opentelemetry-cpp.cmake) + endif() +if(FALSE) # Setup external proto library at third_party/envoy-api with 2 download URLs - if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/envoy-api) + if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/envoy-api AND gRPC_DOWNLOAD_ARCHIVES) # Download the archive via HTTP, validate the checksum, and extract to third_party/envoy-api. -@@ -403,6 +404,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds) - xds-cb28da3451f158a947dfc45090fe92b07b243bc1 +@@ -478,6 +479,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds AND gRPC_DOWNLOAD_ARC + xds-3a472e524827f72d1ad621c4983dd5af54c46776 ) endif() +endif() if(WIN32) - set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32) + set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} ws2_32 crypt32) -- -2.25.1 +2.34.1
package/grpc/grpc.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229 grpc-1.51.1.tar.gz +sha256 79ed4ab72fa9589b20f8b0b76c16e353e4cfec1d773d33afad605d97b5682c61 grpc-1.66.1.tar.gz sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE
package/grpc/grpc.mk +2 -1
@@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.51.1 +GRPC_VERSION = 1.66.1 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) GRPC_LICENSE_FILES = LICENSE
@@ -29,6 +29,7 @@ GRPC_CONF_OPTS = \ -DgRPC_RE2_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package \ + -DgRPC_BUILD_CODEGEN=OFF \ -DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF \
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hi James,
I finally found time to test the patchset.
Quoted 6 lines · James Hilliard
Migrate protobuf build from autotools to cmake.
Migrate protobuf-python to use pypi sources which are now required for
setup.pybuilds:
https://github.com/protocolbuffers/protobuf/tree/v28.1/python#building-from-setuppy
After applying the patchset the pkgconf detection of (host-)protobuf seems to be broken. At least on my system it just goes into an endless loop. Which is not happening before the bump.
This breaks e.g., protobuf-c and collectd as their configure step just blocks indefinitely.
Defconfig to reproduce:
BR2_arm=y
BR2_cortex_a15=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_PROTOBUF_C=y
separated command which never returns:
./output/host/bin/pkgconf --cflags protobuf
Can you reproduce that? Any idea what could be causing this?
Regards,
Michael
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 26 lines · Michael Nosthoff
Hi James,
I finally found time to test the patchset.
Quoted 6 lines · James Hilliard
Migrate protobuf build from autotools to cmake.
Migrate protobuf-python to use pypi sources which are now required for
setup.pybuilds:
https://github.com/protocolbuffers/protobuf/tree/v28.1/python#building-from-setuppyAfter applying the patchset the pkgconf detection of (host-)protobuf seems to be broken. At least on my system it just goes into an endless loop. Which is not happening before the bump.
This breaks e.g., protobuf-c and collectd as their configure step just blocks indefinitely.
Defconfig to reproduce:
BR2_arm=y
BR2_cortex_a15=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_PROTOBUF_C=y
Quoted 5 lines
separated command which never returns:
./output/host/bin/pkgconf --cflags protobufCan you reproduce that? Any idea what could be causing this?
It appears to be related to us using a very outdated pkgconf, which I actually had sent a patch bumping but which hasn't yet been merged apparently, this does appear to fix that specific issue for me:
https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/
Quoted 4 lines
Regards,
Michael
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 7 lines · On Mon, 23 Sep 2024 20:39:17 -0600 James Hilliard <[email protected]>…
Migrate protobuf build from autotools to cmake.
Migrate protobuf-python to use pypi sources which are now required for
setup.pybuilds:
https://github.com/protocolbuffers/protobuf/tree/v28.1/python#building-from-setuppySigned-off-by James Hilliard <[email protected]>
Here, this breaks the build of host-protobuf-c, as such:
Quoted 1 line
Quoted 1 line
Quoted 1 line
host-protobuf-c 1.5.0 Building
GIT_DIR=. PATH="/home/thomas/projets/buildroot/output/host/bin:/home/thomas/projets/buildroot/output/host/sbin:/home/thomas/sys/bin:/home/thomas/.gem/ruby/2.1.0/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/home/thomas/.rvm/bin:/home/thomas/.local/bin:/home/thomas/projets/git-wrappers:/home/thomas/bootlin/git/bin/" PKG_CONFIG="/home/thomas/projets/buildroot/output/host/bin/pkg-config" PKG_CONFIG_SYSROOT_DIR="/" PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_LIBDIR="/home/thomas/projets/buildroot/output/host/lib/pkgconfig:/home/thomas/projets/buildroot/output/host/share/pkgconfig" /usr/bin/make -j1 -C /home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0/
make[1]: Entering directory '/home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0'
GEN protobuf-c/protobuf-c.pb.cc
CXX protoc-c/protoc_gen_c-c_bytes_field.o
In file included from protoc-c/c_bytes_field.cc:64:./protoc-c/c_helpers.h: In function ‘int google::protobuf::compiler::c::FieldSyntax(const google::protobuf::FieldDescriptor*)’:./protoc-c/c_helpers.h:179:46: error: ‘class google::protobuf::FileDescriptorLegacy’ has no member named ‘syntax’
179 | return FileDescriptorLegacy(field->file()).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3 ? 3 : 2;
| ^~~~~~./protoc-c/c_helpers.h:179:80: error: ‘SYNTAX_PROTO3’ is not a member of ‘google::protobuf::FileDescriptorLegacy’
179 | return FileDescriptorLegacy(field->file()).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3 ? 3 : 2;
| ^~~~~~~~~~~~~
make[1]: *** [Makefile:1567: protoc-c/protoc_gen_c-c_bytes_field.o] Error 1
make[1]: Leaving directory '/home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0'
make: *** [package/pkg-generic.mk:289: /home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0/.stamp_built] Error 2
This is on a Fedora 39 system, gcc 13.x.
Could you have a look? Also Michael Nosthoff reported a separate (weird) pkg-config issue.
Thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 31 lines · Thomas Petazzoni
Quoted 7 lines · On Mon, 23 Sep 2024 20:39:17 -0600 James Hilliard <[email protected]>…
Migrate protobuf build from autotools to cmake.
Migrate protobuf-python to use pypi sources which are now required for
setup.pybuilds:
https://github.com/protocolbuffers/protobuf/tree/v28.1/python#building-from-setuppySigned-off-by James Hilliard <[email protected]>Here, this breaks the build of host-protobuf-c, as such:
Quoted 1 line
Quoted 1 line
Quoted 1 line
host-protobuf-c 1.5.0 Building
GIT_DIR=. PATH="/home/thomas/projets/buildroot/output/host/bin:/home/thomas/projets/buildroot/output/host/sbin:/home/thomas/sys/bin:/home/thomas/.gem/ruby/2.1.0/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/home/thomas/.rvm/bin:/home/thomas/.local/bin:/home/thomas/projets/git-wrappers:/home/thomas/bootlin/git/bin/" PKG_CONFIG="/home/thomas/projets/buildroot/output/host/bin/pkg-config" PKG_CONFIG_SYSROOT_DIR="/" PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_LIBDIR="/home/thomas/projets/buildroot/output/host/lib/pkgconfig:/home/thomas/projets/buildroot/output/host/share/pkgconfig"
/usr/bin/make-j1 -C/home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0/
make[1]: Entering directory '/home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0'
GEN protobuf-c/protobuf-c.pb.cc
CXXprotoc-c/protoc_gen_c-c_bytes_field.o
In file included from protoc-c/c_bytes_field.cc:64:./protoc-c/c_helpers.h: In function ‘intgoogle::protobuf::compiler::c::FieldSyntax(const google::protobuf::FieldDescriptor*)’:./protoc-c/c_helpers.h:179:46: error: ‘class google::protobuf::FileDescriptorLegacy’ has no member named ‘syntax’
179 | return FileDescriptorLegacy(field->file()).syntax() ==FileDescriptorLegacy::SYNTAX_PROTO3? 3 : 2;
| ^~~~~~./protoc-c/c_helpers.h:179:80: error: ‘SYNTAX_PROTO3’ is not a member of ‘google::protobuf::FileDescriptorLegacy’
179 | return FileDescriptorLegacy(field->file()).syntax() ==FileDescriptorLegacy::SYNTAX_PROTO3? 3 : 2;
| ^~~~~~~~~~~~~
make[1]: *** [Makefile:1567:protoc-c/protoc_gen_c-c_bytes_field.o] Error 1
make[1]: Leaving directory '/home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0'
make: *** [package/pkg-generic.mk:289:/home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0/.stamp_built] Error 2
Quoted 4 lines
This is on a Fedora 39 system, gcc 13.x.
Could you have a look? Also Michael Nosthoff reported a separate (weird) pkg-config issue.
Yeah, there's a pending PR that appear to fix this:
https://github.com/protobuf-c/protobuf-c/pull/711
Should be fixed in v3:
https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/
Quoted 8 lines
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Hello James,
Quoted 11 lines · On Sun, 27 Oct 2024 20:57:32 -0600 James Hilliard <[email protected]>…
Quoted 8 lines
make[1]: *** [Makefile:1567:
protoc-c/protoc_gen_c-c_bytes_field.o] Error 1
make[1]: Leaving directory '/home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0'
make: *** [package/pkg-generic.mk:289:/home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0/.stamp_built] Error 2This is on a Fedora 39 system, gcc 13.x.
Could you have a look? Also Michael Nosthoff reported a separate (weird) pkg-config issue.
Yeah, there's a pending PR that appear to fix this:
https://github.com/protobuf-c/protobuf-c/pull/711
Which of the two issues is this fixing? I was reporting a build failure, and Michael Nosthoff was reporting a build hang in pkg-config.
Thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 12 lines · Thomas Petazzoni
Hello James,
Quoted 6 lines · On Sun, 27 Oct 2024 20:57:32 -0600 James Hilliard <[email protected]>…
Quoted 6 lines
make[1]: *** [Makefile:1567:
protoc-c/protoc_gen_c-c_bytes_field.o] Error 1
make[1]: Leaving directory '/home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0'
make: *** [package/pkg-generic.mk:289:/home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0/.stamp_built] Error 2This is on a Fedora 39 system, gcc 13.x.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Could you have a look? Also Michael Nosthoff reported a separate (weird) pkg-config issue.
Yeah, there's a pending PR that appear to fix this:
https://github.com/protobuf-c/protobuf-c/pull/711Which of the two issues is this fixing? I was reporting a build failure, and Michael Nosthoff was reporting a build hang in pkg-config.
This fixes the build failure you reported, updating pkgconf fixes the build hang.
Quoted 8 lines
Thanks!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 5 lines · On Mon, 28 Oct 2024 14:21:21 -0600 James Hilliard <[email protected]>…
Quoted 2 lines
Which of the two issues is this fixing? I was reporting a build failure, and Michael Nosthoff was reporting a build hang in pkg-config.
This fixes the build failure you reported, updating pkgconf fixes the build hang.
So this series depends on the pkg-config bump.
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 11 lines · Thomas Petazzoni
Quoted 5 lines · On Mon, 28 Oct 2024 14:21:21 -0600 James Hilliard <[email protected]>…
Quoted 2 lines
Which of the two issues is this fixing? I was reporting a build failure, and Michael Nosthoff was reporting a build hang in pkg-config.
This fixes the build failure you reported, updating pkgconf fixes the build hang.
So this series depends on the pkg-config bump.
Yes.
Quoted 6 lines
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Hi,
Quoted 11 lines · Thomas Petazzoni via buildroot
Hello James,
Quoted 6 lines · On Sun, 27 Oct 2024 20:57:32 -0600 James Hilliard <[email protected]>…
Quoted 6 lines
make[1]: *** [Makefile:1567:
protoc-c/protoc_gen_c-c_bytes_field.o] Error 1
make[1]: Leaving directory '/home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0'
make: *** [package/pkg-generic.mk:289:/home/thomas/projets/buildroot/output/build/host-protobuf-c-1.5.0/.stamp_built] Error 2This is on a Fedora 39 system, gcc 13.x.
Quoted 9 lines
Quoted 5 lines
Quoted 2 lines
Could you have a look? Also Michael Nosthoff reported a separate (weird) pkg-config issue.
Yeah, there's a pending PR that appear to fix this:
https://github.com/protobuf-c/protobuf-c/pull/711Which of the two issues is this fixing? I was reporting a build failure, and Michael Nosthoff was reporting a build hang in pkg-config.
This should fix your issue. My issue is also fixed in the new series by bumping pkgconf. I'll send feedback on this separately.
Regards,
Michael
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot