package/{python-}protobuf: bump to version 28.1
PATCH v4 1/6 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 v4 2/6 package/grpc: bump to version 1.66.1
Add 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
@@ -560,8 +560,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
Re: [Buildroot] [PATCH v4 2/6] package/grpc: bump to version 1.66.1
Quoted 8 lines · On Wed, 30 Oct 2024 13:00:16 -0600 James Hilliard <[email protected]>…
Add new -DgRPC_BUILD_CODEGEN=OFF config option which is required if no plugins are enabled.
Drop no longer relevant add
GPR_DISABLE_WRAPPED_MEMCPYpatch.Rebase remaining patches.
Signed-off-by James Hilliard <[email protected]>
There's something I'm not super happy with with this bump:
- It is needed to fix the current build breakage in grpc
(http://autobuild.buildroot.net/results/b2dfc13dcac8396bc7510a4d992558a01d3c9f22/),
which is caused by your bump of libabseil-cpp in 0d40b47866753340b214e811af53e6a95216bbb3.
- But this grpc version bump *requires* the protobuf bump (apparently). So it's a lot of version bumps needed to fix a build issue.
I would have preferred a more minimal fix of the grpc build for the current master, and separately a bump, but backporting the fix for the libaseil-cpp issue seems difficult.
So, fair enough, let's do it with a protobuf bump + grpc bump.
Overall, I did not apply this patch because it requires your protobuf bump, but the protobuf bump needs more work.
However, please add into your patch series the following additional patch:
commit 122e581244877ce4383448a1a298dd9ae480cde7
Author: Thomas Petazzoni <[email protected]> Date: Mon Nov 4 23:27:44 2024 +0100
package/grpc: remove BR2_TOOLCHAIN_HAS_GCC_BUG_85180 dead code
This work-around was added in commit 716f8b34c526c702aa19e9a66a25df5d3a6ea663 ("package/grpc: work around gcc bug 85180") to work around a bug on Microblaze. However, since commit
ae0557403a3a4cbf5354f0ab1784a08623382e5e ("package/libabseil-cpp: add BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS"), grpc depends on libaseil-cpp, which isn't available on Microblaze, making the GCC_BUG_85180 no longer needed, and effectively dead code. This commit drops it.
package/grpc/grpc.mk +0 -5
@@ -59,11 +59,6 @@ GRPC_CFLAGS += -DGPR_DISABLE_WRAPPED_MEMCPY GRPC_CXXFLAGS += -DGPR_DISABLE_WRAPPED_MEMCPY endif -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) -GRPC_CFLAGS += -O0 -GRPC_CXXFLAGS += -O0 -endif - GRPC_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(GRPC_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(GRPC_CXXFLAGS)"
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
PATCH v4 3/6 package/pkgconf: bump to version 2.3.0
In reply to James HilliardRebase only prefix subset of variables patch.
Drop revert main assume modversion patch which is now upstream.
--- .checkpackageignore | 1 - ...th-the-sysroot-a-subset-of-variables.patch | 78 ++++++++++--------- ...me-modversion-insted-of-version-if-o.patch | 45 ----------- package/pkgconf/pkgconf.hash | 2 +- package/pkgconf/pkgconf.mk | 2 +- 5 files changed, 42 insertions(+), 86 deletions(-) delete mode 100644 package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch
.checkpackageignore +0 -1
@@ -1025,7 +1025,6 @@ package/pistache/0001-src-common-transport.cc-fallback-value-for-RUSAGE_TH.patch package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch lib_patch.Upstream package/pixman/0001-Disable-tests.patch lib_patch.Upstream package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch lib_patch.Upstream -package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch lib_patch.Upstream package/pkgconf/pkg-config.in Shellcheck package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch lib_patch.Upstream package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch lib_patch.Upstream
package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch +40 -38
161 lines not on this page · raw message
package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch deleted +0 -45
45 lines not on this page · raw message
package/pkgconf/pkgconf.hash +1 -1
@@ -1,3 +1,3 @@ # Locally calculated -sha256 61f0b31b0d5ea0e862b454a80c170f57bad47879c0c42bd8de89200ff62ea210 pkgconf-1.6.3.tar.xz +sha256 3a9080ac51d03615e7c1910a0a2a8df08424892b5f13b0628a204d3fcce0ea8b pkgconf-2.3.0.tar.xz sha256 07ee94b50a41ee3fc4e13a9b9c60b26fc28488494c465639f7e5f07a3952ec04 COPYING
package/pkgconf/pkgconf.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -PKGCONF_VERSION = 1.6.3 +PKGCONF_VERSION = 2.3.0 PKGCONF_SITE = https://distfiles.ariadne.space/pkgconf PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz PKGCONF_LICENSE = pkgconf 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 v4 3/6] package/pkgconf: bump to version 2.3.0
Quoted 5 lines · On Wed, 30 Oct 2024 13:00:17 -0600 James Hilliard <[email protected]>…
Rebase only prefix subset of variables patch.
Drop revert main assume modversion patch which is now upstream.
Signed-off-by James Hilliard <[email protected]>
Quoted 8 lines
--- .checkpackageignore | 1 - ...th-the-sysroot-a-subset-of-variables.patch | 78 ++++++++++--------- ...me-modversion-insted-of-version-if-o.patch | 45 ----------- package/pkgconf/pkgconf.hash | 2 +- package/pkgconf/pkgconf.mk | 2 +- 5 files changed, 42 insertions(+), 86 deletions(-) delete mode 100644 package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch
Applied to next, 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 v4 4/6 package/protobuf-c: fix protobuf >= 26.0 compatibility
In reply to James HilliardAdd some patches fixing protobuf >= 26.0 compatibility.
--- ...ct-against-being-invoked-against-edi.patch | 57 +++++++++++++ ...dSyntax-to-maximize-compatibility-ac.patch | 84 +++++++++++++++++++ ...nerateHeader-Set-min_header_version-.patch | 44 ++++++++++ 3 files changed, 185 insertions(+) create mode 100644 package/protobuf-c/0001-CGenerator-Protect-against-being-invoked-against-edi.patch create mode 100644 package/protobuf-c/0002-Reimplement-FieldSyntax-to-maximize-compatibility-ac.patch create mode 100644 package/protobuf-c/0003-FileGenerator-GenerateHeader-Set-min_header_version-.patch
package/protobuf-c/0001-CGenerator-Protect-against-being-invoked-against-edi.patch new file +57 -0
@@ -0,0 +1,57 @@ +From 2480f4d9d2fa97e5511ed0914ee529a344e969a7 Mon Sep 17 00:00:00 2001 +From: Robert Edmonds <[email protected]> +Date: Wed, 20 Mar 2024 22:43:30 -0400 +Subject: [PATCH] CGenerator: Protect against being invoked against "edition" + syntax .proto files + +The Google protobuf project is currently experimenting with a new syntax +for .proto files called "editions". Since protobuf-c is a proto2/proto3 +compiler, after the previous commit reimplementing `FieldSyntax()`, the +protobuf compiler will abort like this if presented with an "editions" +syntax .proto file due to the safety check in `FieldSyntax()`: + + $ protoc --experimental_editions --c_out=. test.proto + protoc-gen-c: ./protoc-c/c_helpers.h:178: int google::protobuf::compiler::c::FieldSyntax(const google::protobuf::FieldDescriptor*): Assertion `syntax == "proto2" || syntax == "proto3"' failed. + --c_out: protoc-gen-c: Plugin killed by signal 6. + +On protobuf 26, our `CodeGenerator` can implement certain methods to +declare that we "support" editions, and then reject any other edition +except proto2 and proto3, which have apparently been retroactively +declared to be "editions". Of course this needs to be wrapped in a +version guard. + +With this protection in place, the protobuf compiler cleanly exits with +a nice error message like this: + + $ protoc --experimental_editions --c_out=. test.proto + WARNING: All log messages before absl::InitializeLog() is called are written to STDERR + E0000 00:00:1710988958.296200 20022 descriptor.cc:4620] Invalid proto descriptor for file "test.proto": + E0000 00:00:1710988958.296239 20022 descriptor.cc:4623] test.proto: Edition 2023 is later than the maximum supported edition PROTO3 + --c_out: protoc-gen-c: Plugin failed with status code 1. + +Signed-off-by: James Hilliard <[email protected]> +Upstream: https://github.com/protobuf-c/protobuf-c/pull/711 +--- + protoc-c/c_generator.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/protoc-c/c_generator.h b/protoc-c/c_generator.h +index b8b44aa..4aeb579 100644 +--- a/protoc-c/c_generator.h ++++ b/protoc-c/c_generator.h +@@ -93,6 +93,12 @@ class PROTOC_C_EXPORT CGenerator : public CodeGenerator { + const std::string& parameter, + OutputDirectory* output_directory, + std::string* error) const; ++ ++#if GOOGLE_PROTOBUF_VERSION >= 5026000 ++ uint64_t GetSupportedFeatures() const { return CodeGenerator::FEATURE_SUPPORTS_EDITIONS; } ++ Edition GetMinimumEdition() const { return Edition::EDITION_PROTO2; } ++ Edition GetMaximumEdition() const { return Edition::EDITION_PROTO3; } ++#endif + }; + + } // namespace c +-- +2.34.1 +
package/protobuf-c/0002-Reimplement-FieldSyntax-to-maximize-compatibility-ac.patch new file +84 -0
84 lines not on this page · raw message
package/protobuf-c/0003-FileGenerator-GenerateHeader-Set-min_header_version-.patch new file +44 -0
44 lines not on this page · raw message
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v4 4/6] package/protobuf-c: fix protobuf >= 26.0 compatibility
Quoted 11 lines · On Wed, 30 Oct 2024 13:00:18 -0600 James Hilliard <[email protected]>…
Add some patches fixing protobuf >= 26.0 compatibility.
Signed-off-by James Hilliard <[email protected]>--- ...ct-against-being-invoked-against-edi.patch | 57 +++++++++++++ ...dSyntax-to-maximize-compatibility-ac.patch | 84 +++++++++++++++++++ ...nerateHeader-Set-min_header_version-.patch | 44 ++++++++++ 3 files changed, 185 insertions(+) create mode 100644 package/protobuf-c/0001-CGenerator-Protect-against-being-invoked-against-edi.patch create mode 100644 package/protobuf-c/0002-Reimplement-FieldSyntax-to-maximize-compatibility-ac.patch create mode 100644 package/protobuf-c/0003-FileGenerator-GenerateHeader-Set-min_header_version-.patch
Applied to master, thanks. This should have appeared *before* the protobuf bump in your series, as it fixes a fallout from the bump, and therefore with your proposed order, there is a bisectability breakage between PATCH 1 and PATCH 4.
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 v4 5/6 package/mosh: fix compatibility with newer protobuf versions
In reply to James HilliardWe need to backport a patch to fix compatibility with newer protobuf versions.
Remove CFLAGS setting -std=c++11 and enable autoreconf so that patch is applied properly.
--- .../mosh/0001-Bump-C-version-to-C-17.patch | 49 +++++++++++++++++++ package/mosh/mosh.mk | 4 +- 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 package/mosh/0001-Bump-C-version-to-C-17.patch
package/mosh/0001-Bump-C-version-to-C-17.patch new file +49 -0
@@ -0,0 +1,49 @@ +From eee1a8cf413051c2a9104e8158e699028ff56b26 Mon Sep 17 00:00:00 2001 +From: Alex Chernyakhovsky <[email protected]> +Date: Sun, 30 Jul 2023 16:19:46 -0400 +Subject: [PATCH] Bump C++ version to C++17 + +Protobuf versions since 3.6.0 have long had a C++11 dependency; even +more recent versions have picked up an Abseil dependency bumping that +to C++14. Since it is now 2023, defaulting to C++17 is reasonable, so +remove the conditional C++ standards version check that mosh +previously had and replace it with an unconditional C++17 check. + +This means that all future commits can use C++17 features. According +to https://en.cppreference.com/w/cpp/compiler_support/17 this means +that minimum effective compiler versions for mosh become: + +gcc 7 (May 2017) +clang 5 (September 2017) + +This, in turn, implies that future versions of mosh will no longer be +available for RHEL/CentOS 7 (June 2014). + +Closes: #1267 + +Signed-off-by: James Hilliard <[email protected]> +Upstream: https://github.com/mobile-shell/mosh/commit/eee1a8cf413051c2a9104e8158e699028ff56b26 +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ee70c7b..7f7dc3b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,9 +22,9 @@ AS_IF([test x"$PROTOC" = x], + # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + +-# Protobuf 3.6+ requires C++11. +-AS_IF([pkg-config --atleast-version 3.6.0 protobuf], +- [AX_CXX_COMPILE_STDCXX([11])]) ++# Protobuf transitively requires at least C++14, get ahead of the ++# curve and require at least C++17. ++AX_CXX_COMPILE_STDCXX([17]) + + WARNING_CXXFLAGS="" + PICKY_CXXFLAGS="" +-- +2.34.1 +
package/mosh/mosh.mk +1 -3
@@ -9,9 +9,7 @@ MOSH_SITE = https://mosh.org MOSH_DEPENDENCIES = zlib ncurses protobuf host-pkgconf MOSH_LICENSE = GPL-3.0+ with exception MOSH_LICENSE_FILES = COPYING COPYING.iOS - -# protobuf needs c++11 (since 3.6.0) -MOSH_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +MOSH_AUTORECONF = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) MOSH_CONF_OPTS += --with-crypto-library=openssl
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 v4 5/6] package/mosh: fix compatibility with newer protobuf versions
Quoted 6 lines · On Wed, 30 Oct 2024 13:00:19 -0600 James Hilliard <[email protected]>…
We need to backport a patch to fix compatibility with newer protobuf versions.
Remove CFLAGS setting -std=c++11 and enable autoreconf so that patch is applied properly.
Quoted 6 lines
Signed-off-by James Hilliard <[email protected]>--- .../mosh/0001-Bump-C-version-to-C-17.patch | 49 +++++++++++++++++++ package/mosh/mosh.mk | 4 +- 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 package/mosh/0001-Bump-C-version-to-C-17.patch
Applied to master, thanks. This should have been *before* the protobuf bump in your series, as it fixes an issue with the bump, but also works before the bump, so it really is a preparation commit.
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 v4 6/6 package/collectd: fix protoc version check
In reply to James HilliardWe need to add a patch fixing the protoc version check in collectd's configure script.
--- ...onfigure.ac-fix-protoc-version-check.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/collectd/0004-configure.ac-fix-protoc-version-check.patch
package/collectd/0004-configure.ac-fix-protoc-version-check.patch new file +48 -0
@@ -0,0 +1,48 @@ +From 77f33d05355b115d3384d94c1c4e36c56ea28b09 Mon Sep 17 00:00:00 2001 +From: James Hilliard <[email protected]> +Date: Wed, 30 Oct 2024 12:45:51 -0600 +Subject: [PATCH] configure.ac: fix protoc version check + +The current version check for 3.0.0+ fails to handle cases where +protoc is above version 3.0.0 but does not start with a 3, for +example protoc may have a version of 28.1. + +To fix this use AX_COMPARE_VERSION to properly compare the version. + +Signed-off-by: James Hilliard <[email protected]> +Upstream: https://github.com/collectd/collectd/pull/4332 +--- + configure.ac | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 86d2378b..1f7a9cdf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4897,13 +4897,16 @@ AC_PATH_PROG([PROTOC], [protoc]) + have_protoc3="no" + if test "x$PROTOC" != "x"; then + AC_MSG_CHECKING([for protoc 3.0.0+]) +- if $PROTOC --version | $EGREP libprotoc.3 >/dev/null; then +- protoc3="yes (`$PROTOC --version`)" +- have_protoc3="yes" +- else +- protoc3="no (`$PROTOC --version`)" +- fi +- AC_MSG_RESULT([$protoc3]) ++ AC_SUBST([PROTOC_VERSION], [`$PROTOC --version | cut -d ' ' -f 2`]) ++ AX_COMPARE_VERSION([$PROTOC_VERSION],[ge],[3], ++ [ ++ have_protoc3="yes" ++ AC_MSG_RESULT([yes ($PROTOC_VERSION)]) ++ ], ++ [ ++ AC_MSG_RESULT([no ($PROTOC_VERSION)]) ++ ] ++ ) + fi + AM_CONDITIONAL([HAVE_PROTOC3], [test "x$have_protoc3" = "xyes"]) + +-- +2.34.1 +
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 v4 6/6] package/collectd: fix protoc version check
Quoted 8 lines · On Wed, 30 Oct 2024 13:00:20 -0600 James Hilliard <[email protected]>…
We need to add a patch fixing the protoc version check in collectd's configure script.
Signed-off-by James Hilliard <[email protected]>--- ...onfigure.ac-fix-protoc-version-check.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/collectd/0004-configure.ac-fix-protoc-version-check.patch
Applied to master, thanks. This should have appeared *before* the protobuf bump in your series, as it fixes an issue with the bump, but also works before the bump, so it really is a preparation commit.
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
Hello,
Thanks for your work on this complicated package.
Quoted 1 line · On Wed, 30 Oct 2024 13:00:15 -0600 James Hilliard <[email protected]>…
Migrate protobuf build from autotools to cmake.
Unfortunately, while doing so, you have missed to review carefully protobuf.mk, and you left some code that was autotools-related, and therefore no longer taken into account after the cmake migration.
In particular:
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)PROTOBUF_CONF_ENV += LIBS=-latomic
endif
is not taken into account after the cmake migration, but is still needed, otherwise the build breaks for example on SPARC. It needs to be changed to:
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
-PROTOBUF_CONF_ENV += LIBS=-latomic +PROTOBUF_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic
endif
Also:
PROTOBUF_CXXFLAGS = $(TARGET_CXXFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)PROTOBUF_CXXFLAGS += -O0
endif
ifeq ($(BR2_or1k),y)PROTOBUF_CXXFLAGS += -mcmodel=large
endif
PROTOBUF_CONF_ENV = CXXFLAGS="$(PROTOBUF_CXXFLAGS)"
is not taken into account after the cmake migration... but is in fact no longer needed, and therefore should be dropped (perhaps as a preparation commit). It is no longer needed because:
The BR2_or1k workaround is removed, as protobuf depends on libabseil-cpp, which isn't available on OpenRISC.
The BR2_TOOLCHAIN_HAS_GCC_BUG_85180 workaround is removed, as this workaround is for Microblaze, and protobuf depends on libabseil-cpp, which isn't avialable on Microblaze.
Finally, this protobuf bump breaks the build of kismet (at least). Could you check this, and generally check more reverse dependencies of protobuf?
Thanks a lot!
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