* [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc
@ 2025-12-09 20:18 Michael Nosthoff via buildroot
2025-12-09 20:18 ` [Buildroot] [PATCH 2/4] package/libabseil-cpp: bump to version 20250814.1 Michael Nosthoff via buildroot
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Michael Nosthoff via buildroot @ 2025-12-09 20:18 UTC (permalink / raw)
To: buildroot; +Cc: Asaf Kahlon
abseil and hence protobuf/grpc now need C++17.
Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
---
...005-configure.ax-fix-grpc-build-2025.patch | 73 +++++++++++++++++++
1 file changed, 73 insertions(+)
create mode 100644 package/collectd/0005-configure.ax-fix-grpc-build-2025.patch
diff --git a/package/collectd/0005-configure.ax-fix-grpc-build-2025.patch b/package/collectd/0005-configure.ax-fix-grpc-build-2025.patch
new file mode 100644
index 0000000000..e750483135
--- /dev/null
+++ b/package/collectd/0005-configure.ax-fix-grpc-build-2025.patch
@@ -0,0 +1,73 @@
+From 42b2ede4dadcf88293e408bcdf5645995b61b148 Mon Sep 17 00:00:00 2001
+From: Michael Nosthoff <buildroot@heine.tech>
+Date: Wed, 29 Oct 2025 16:48:20 +0100
+Subject: [PATCH] configure.ac: fix grpc build
+
+Similar to the previous "configure.ac: fix grpc build" commit:
+Google bumped it's compiler requirements again [1], hence the c++ version needs to be adjusted to c++17 to be able to build with the latest grpc versions.
+
+[1] https://github.com/google/oss-policies-info/blob/a5e3ed43d45ad615a20201cea8f7282f595555da/foundational-cxx-support-matrix.md
+
+Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
+Upstream: https://github.com/collectd/collectd/commit/42b2ede4dadcf88293e408bcdf5645995b61b148
+---
+ configure.ac | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa03fce63..eb6cbbc5d5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2844,20 +2844,20 @@ PKG_CHECK_MODULES([GRPCPP], [grpc++],
+ fi
+
+ if test "x$withval" != "xno"; then
+- AC_MSG_CHECKING([whether $CXX accepts -std=c++14])
+- if test_cxx_flags -std=c++14; then
++ AC_MSG_CHECKING([whether $CXX accepts -std=c++17])
++ if test_cxx_flags -std=c++17; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+- with_libgrpcpp="no (requires C++14 support)"
+- with_libprotobuf="no (<absl/base/policy_checks.h> requires C++14 support)"
++ with_libgrpcpp="no (requires C++17 support)"
++ with_libprotobuf="no (<absl/base/policy_checks.h> requires C++17 support)"
+ fi
+ fi
+
+ if test "x$with_libgrpcpp" = "xyes"; then
+ AC_LANG_PUSH(C++)
+ SAVE_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="-std=c++14 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS"
++ CPPFLAGS="-std=c++17 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS"
+ AC_CHECK_HEADERS([grpc++/grpc++.h],
+ [with_libgrpcpp="yes"],
+ [with_libgrpcpp="no (<grpc++/grpc++.h> not found)"]
+@@ -2871,7 +2871,7 @@ if test "x$with_libgrpcpp" = "xyes"; then
+ SAVE_CPPFLAGS="$CPPFLAGS"
+ SAVE_LDFLAGS="$LDFLAGS"
+ SAVE_LIBS="$LIBS"
+- CPPFLAGS="-std=c++14 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS"
++ CPPFLAGS="-std=c++17 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS"
+ LDFLAGS="$with_libgrpcpp_ldflags"
+ if test "x$GRPCPP_LIBS" = "x"; then
+ LIBS="-lgrpc++"
+@@ -2899,7 +2899,7 @@ if test "x$with_libgrpcpp" = "xyes"; then
+ AC_LANG_POP(C++)
+ fi
+
+-BUILD_WITH_LIBGRPCPP_CPPFLAGS="-std=c++14 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS"
++BUILD_WITH_LIBGRPCPP_CPPFLAGS="-std=c++17 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS"
+ BUILD_WITH_LIBGRPCPP_LDFLAGS="$with_libgrpcpp_ldflags"
+ BUILD_WITH_LIBGRPCPP_LIBS="$GRPCPP_LIBS"
+ AC_SUBST([BUILD_WITH_LIBGRPCPP_CPPFLAGS])
+@@ -4843,7 +4843,7 @@ if test "x$withval" != "xno"; then
+ AC_CHECK_LIB([protobuf], [main],
+ [
+ SAVE_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="-std=c++14 $with_libprotobuf_cppflags $PROTOBUF_CFLAGS"
++ CPPFLAGS="-std=c++17 $with_libprotobuf_cppflags $PROTOBUF_CFLAGS"
+ if test "x$PROTOBUF_LIBS" = "x"
+ then
+ PROTOBUF_LIBS="-lprotobuf"
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 2/4] package/libabseil-cpp: bump to version 20250814.1 2025-12-09 20:18 [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc Michael Nosthoff via buildroot @ 2025-12-09 20:18 ` Michael Nosthoff via buildroot 2025-12-09 20:18 ` [Buildroot] [PATCH 3/4] package/{|python-}protobuf: bump to version 33.2 Michael Nosthoff via buildroot ` (2 subsequent siblings) 3 siblings, 0 replies; 8+ messages in thread From: Michael Nosthoff via buildroot @ 2025-12-09 20:18 UTC (permalink / raw) To: buildroot - enforce C++17 as this is required since 20250512 Release Notes: https://github.com/abseil/abseil-cpp/releases/tag/20250814.1 https://github.com/abseil/abseil-cpp/releases/tag/20250814.0 https://github.com/abseil/abseil-cpp/releases/tag/20250512.0 Signed-off-by: Michael Nosthoff <buildroot@heine.tech> --- package/libabseil-cpp/Config.in | 2 +- package/libabseil-cpp/libabseil-cpp.hash | 2 +- package/libabseil-cpp/libabseil-cpp.mk | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libabseil-cpp/Config.in b/package/libabseil-cpp/Config.in index 7b65ec40d0..6bbe9518b2 100644 --- a/package/libabseil-cpp/Config.in +++ b/package/libabseil-cpp/Config.in @@ -18,7 +18,7 @@ config BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS config BR2_PACKAGE_LIBABSEIL_CPP bool "libabseil-cpp" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # uses dlfcn.h depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS diff --git a/package/libabseil-cpp/libabseil-cpp.hash b/package/libabseil-cpp/libabseil-cpp.hash index 701801a7c4..e1b8763e2a 100644 --- a/package/libabseil-cpp/libabseil-cpp.hash +++ b/package/libabseil-cpp/libabseil-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 16242f394245627e508ec6bb296b433c90f8d914f73b9c026fddb905e27276e8 libabseil-cpp-20250127.0.tar.gz +sha256 1692f77d1739bacf3f94337188b78583cf09bab7e420d2dc6c5605a4f86785a1 libabseil-cpp-20250814.1.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE diff --git a/package/libabseil-cpp/libabseil-cpp.mk b/package/libabseil-cpp/libabseil-cpp.mk index 34d62c4dd1..fe97c1c2f3 100644 --- a/package/libabseil-cpp/libabseil-cpp.mk +++ b/package/libabseil-cpp/libabseil-cpp.mk @@ -4,19 +4,19 @@ # ################################################################################ -LIBABSEIL_CPP_VERSION = 20250127.0 +LIBABSEIL_CPP_VERSION = 20250814.1 LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION)) LIBABSEIL_CPP_LICENSE = Apache-2.0 LIBABSEIL_CPP_LICENSE_FILES = LICENSE LIBABSEIL_CPP_INSTALL_STAGING = YES LIBABSEIL_CPP_CONF_OPTS = \ - -DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_CXX_STANDARD=17 \ -DABSL_ENABLE_INSTALL=ON \ -DABSL_USE_GOOGLETEST_HEAD=OFF HOST_LIBABSEIL_CPP_CONF_OPTS = \ - -DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_CXX_STANDARD=17 \ -DABSL_ENABLE_INSTALL=ON \ -DABSL_USE_GOOGLETEST_HEAD=OFF -- 2.43.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/4] package/{|python-}protobuf: bump to version 33.2 2025-12-09 20:18 [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc Michael Nosthoff via buildroot 2025-12-09 20:18 ` [Buildroot] [PATCH 2/4] package/libabseil-cpp: bump to version 20250814.1 Michael Nosthoff via buildroot @ 2025-12-09 20:18 ` Michael Nosthoff via buildroot 2025-12-09 20:18 ` [Buildroot] [PATCH 4/4] package/grpc: bump to version 1.76.0 Michael Nosthoff via buildroot 2025-12-28 13:57 ` [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc Thomas Petazzoni via buildroot 3 siblings, 0 replies; 8+ messages in thread From: Michael Nosthoff via buildroot @ 2025-12-09 20:18 UTC (permalink / raw) To: buildroot; +Cc: James Hilliard, Asaf Kahlon - set BUILD_LIBUPB=ON as disabling it is currently broken (see [0]) - python-protobuf increased its major version to 6 due to breaking changes in v30 Changelogs: v30.0: https://github.com/protocolbuffers/protobuf/releases/tag/v30.0 v31.0: https://github.com/protocolbuffers/protobuf/releases/tag/v31.0 v32.0: https://github.com/protocolbuffers/protobuf/releases/tag/v32.0 v33.0: https://github.com/protocolbuffers/protobuf/releases/tag/v33.0 v33.2: https://github.com/protocolbuffers/protobuf/releases/tag/v33.2 [0] https://github.com/protocolbuffers/protobuf/issues/20538 Signed-off-by: Michael Nosthoff <buildroot@heine.tech> --- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 4 ++-- package/python-protobuf/python-protobuf.hash | 4 ++-- package/python-protobuf/python-protobuf.mk | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index 98159ad897..db91cf296b 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 008a11cc56f9b96679b4c285fd05f46d317d685be3ab524b2a310be0fbad987e protobuf-29.3.tar.gz +sha256 6b6599b54c88d75904b7471f5ca34a725fa0af92e134dd1a32d5b395aa4b4ca8 protobuf-33.2.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 4540443702..deaa31d121 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,7 +7,7 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works and to update its hash, # as they share the same version/site variables. -PROTOBUF_VERSION = 29.3 +PROTOBUF_VERSION = 33.2 PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause PROTOBUF_LICENSE_FILES = LICENSE @@ -34,7 +34,7 @@ HOST_PROTOBUF_CONF_OPTS = \ -Dprotobuf_ALLOW_CCACHE=ON \ -Dprotobuf_BUILD_CONFORMANCE=OFF \ -Dprotobuf_BUILD_LIBPROTOC=ON \ - -Dprotobuf_BUILD_LIBUPB=OFF \ + -Dprotobuf_BUILD_LIBUPB=ON \ -Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \ -Dprotobuf_BUILD_PROTOC_BINARIES=ON \ -Dprotobuf_BUILD_TESTS=OFF \ diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index 1e1833980c..fdfbc4b4f1 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/protobuf/json -md5 26ee22a630b0dbfce4de03adc5600fbc protobuf-5.29.3.tar.gz -sha256 5da0f41edaf117bde316404bad1a486cb4ededf8e4a54891296f648e8e076620 protobuf-5.29.3.tar.gz +md5 59060f8bb01846579e5c8d95917ad925 protobuf-6.33.2.tar.gz +sha256 56dc370c91fbb8ac85bc13582c9e373569668a290aa2e66a590c2a0d35ddb9e4 protobuf-6.33.2.tar.gz # Locally computed sha256 checksums sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk index 898a133d37..8db9a2f621 100644 --- a/package/python-protobuf/python-protobuf.mk +++ b/package/python-protobuf/python-protobuf.mk @@ -5,8 +5,8 @@ ################################################################################ PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION) -PYTHON_PROTOBUF_SOURCE = protobuf-5.$(PYTHON_PROTOBUF_VERSION).tar.gz -PYTHON_PROTOBUF_SITE = https://files.pythonhosted.org/packages/f7/d1/e0a911544ca9993e0f17ce6d3cc0932752356c1b0a834397f28e63479344 +PYTHON_PROTOBUF_SOURCE = protobuf-6.$(PYTHON_PROTOBUF_VERSION).tar.gz +PYTHON_PROTOBUF_SITE = https://files.pythonhosted.org/packages/34/44/e49ecff446afeec9d1a66d6bbf9adc21e3c7cea7803a920ca3773379d4f6 PYTHON_PROTOBUF_LICENSE = BSD-3-Clause PYTHON_PROTOBUF_LICENSE_FILES = LICENSE PYTHON_PROTOBUF_DEPENDENCIES = host-protobuf -- 2.43.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 4/4] package/grpc: bump to version 1.76.0 2025-12-09 20:18 [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc Michael Nosthoff via buildroot 2025-12-09 20:18 ` [Buildroot] [PATCH 2/4] package/libabseil-cpp: bump to version 20250814.1 Michael Nosthoff via buildroot 2025-12-09 20:18 ` [Buildroot] [PATCH 3/4] package/{|python-}protobuf: bump to version 33.2 Michael Nosthoff via buildroot @ 2025-12-09 20:18 ` Michael Nosthoff via buildroot 2025-12-28 13:57 ` [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc Thomas Petazzoni via buildroot 3 siblings, 0 replies; 8+ messages in thread From: Michael Nosthoff via buildroot @ 2025-12-09 20:18 UTC (permalink / raw) To: buildroot; +Cc: Robert Rose - use new flag gRPC_DOWNLOAD_ARCHIVES=OFF which removed the need for patch 003 - re-allign patches - update 0002 to properly apply and re-enable utf8_range_lib as its linked against grpc_plugin_support Release Notes since 1.66: https://github.com/grpc/grpc/releases/tag/v1.67.0 https://github.com/grpc/grpc/releases/tag/v1.68.0 https://github.com/grpc/grpc/releases/tag/v1.69.0 https://github.com/grpc/grpc/releases/tag/v1.70.0 https://github.com/grpc/grpc/releases/tag/v1.71.0 https://github.com/grpc/grpc/releases/tag/v1.72.0 https://github.com/grpc/grpc/releases/tag/v1.73.0 https://github.com/grpc/grpc/releases/tag/v1.74.0 https://github.com/grpc/grpc/releases/tag/v1.75.0 https://github.com/grpc/grpc/releases/tag/v1.76.0 Signed-off-by: Michael Nosthoff <buildroot@heine.tech> --- ...the-availability-of-pthread_setname_.patch | 14 ++-- ...strict-building-of-host-grpc-to-grpc.patch | 77 +++++++++++-------- ...nconditionally-downloading-api-repos.patch | 38 --------- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 8 +- 5 files changed, 60 insertions(+), 79 deletions(-) delete mode 100644 package/grpc/0003-disable-unconditionally-downloading-api-repos.patch diff --git a/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch b/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch index e8e211758a..909a7fb5b0 100644 --- a/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch +++ b/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch @@ -1,4 +1,4 @@ -From dfec50b899c449bc964514f16e94869de7a68896 Mon Sep 17 00:00:00 2001 +From 3e9f278145fafbfe15a868d0f9032ba590078c3b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Date: Mon, 31 Dec 2018 16:22:07 +0100 Subject: [PATCH] Properly detect the availability of pthread_setname_np() @@ -25,10 +25,10 @@ Signed-off-by: Michael Nosthoff <buildroot@heine.tech> 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 053b9e3784..2565dc5c84 100644 +index f652a4055c..a2c978c7d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -291,6 +291,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) +@@ -303,6 +303,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") @@ -42,10 +42,10 @@ index 053b9e3784..2565dc5c84 100644 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/support/port_platform.h b/include/grpc/support/port_platform.h -index 5fb7426af2..24d438d702 100644 +index 04a90fbf8a..6718233782 100644 --- a/include/grpc/support/port_platform.h +++ b/include/grpc/support/port_platform.h -@@ -228,6 +228,7 @@ +@@ -236,6 +236,7 @@ #endif /* _LP64 */ #ifdef __GLIBC__ #define GPR_POSIX_CRASH_HANDLER 1 @@ -53,7 +53,7 @@ index 5fb7426af2..24d438d702 100644 #ifdef __GLIBC_PREREQ #if __GLIBC_PREREQ(2, 12) #define GPR_LINUX_PTHREAD_NAME 1 -@@ -236,6 +237,7 @@ +@@ -244,6 +245,7 @@ // musl libc & others #define GPR_LINUX_PTHREAD_NAME 1 #endif @@ -62,5 +62,5 @@ index 5fb7426af2..24d438d702 100644 #else /* musl libc */ #define GPR_MUSL_LIBC_COMPAT 1 -- -2.34.1 +2.43.0 diff --git a/package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch b/package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch index 82705d8a1e..d36eb8fca1 100644 --- a/package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch +++ b/package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch @@ -1,4 +1,4 @@ -From 6aab068a6bd92e215b61eaab61062bf1d97bc065 Mon Sep 17 00:00:00 2001 +From fd7f0877e1e4f2305946a5579353d252012ea9e8 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> Date: Tue, 25 May 2021 14:55:23 +0200 Subject: [PATCH] Add option to restrict building of (host-)grpc to @@ -12,14 +12,15 @@ Upstream: not accepted (see https://github.com/grpc/grpc/issues/25322) Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Updated for 1.48.0: +Updated for 1.76.0: +[build utf8_range_lib as it is now explicitly required] Signed-off-by: Michael Nosthoff <buildroot@heine.tech> --- - CMakeLists.txt | 36 +++++++++++++++++++++++++++++++----- - 1 file changed, 31 insertions(+), 5 deletions(-) + CMakeLists.txt | 39 +++++++++++++++++++++++++++++++++------ + 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2565dc5c84..94f8fd3e93 100644 +index bc86c00463..08441ddbd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,12 +50,16 @@ set(gRPC_BUILD_MSVC_MP_COUNT 0 CACHE STRING "The maximum number of processes for @@ -39,7 +40,7 @@ index 2565dc5c84..94f8fd3e93 100644 set(gRPC_INSTALL ${gRPC_INSTALL_default} CACHE BOOL "Generate installation target") -@@ -662,6 +666,8 @@ add_custom_target(plugins +@@ -689,6 +693,8 @@ add_custom_target(plugins DEPENDS ${_gRPC_PLUGIN_LIST} ) @@ -48,16 +49,16 @@ index 2565dc5c84..94f8fd3e93 100644 add_custom_target(tools_c DEPENDS ) -@@ -673,6 +679,8 @@ add_custom_target(tools_cxx +@@ -700,6 +706,8 @@ add_custom_target(tools_cxx add_custom_target(tools DEPENDS tools_c tools_cxx) +endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY + protobuf_generate_grpc_cpp_with_import_path_correction( - src/proto/grpc/channelz/channelz.proto src/proto/grpc/channelz/channelz.proto + src/core/ext/transport/chaotic_good/chaotic_good_frame.proto src/core/ext/transport/chaotic_good/chaotic_good_frame.proto ) -@@ -1660,7 +1668,7 @@ if(gRPC_BUILD_TESTS) +@@ -1986,7 +1994,7 @@ if(gRPC_BUILD_TESTS) DEPENDS buildtests_c buildtests_cxx) endif() @@ -66,7 +67,7 @@ index 2565dc5c84..94f8fd3e93 100644 add_library(address_sorting third_party/address_sorting/address_sorting.c -@@ -2855,6 +2863,8 @@ if(gRPC_INSTALL) +@@ -3221,6 +3229,8 @@ if(gRPC_INSTALL) ) endif() @@ -75,16 +76,16 @@ index 2565dc5c84..94f8fd3e93 100644 if(gRPC_BUILD_TESTS) add_library(grpc_test_util -@@ -2987,6 +2997,8 @@ endif() +@@ -3371,6 +3381,8 @@ endif() endif() +if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + add_library(grpc_unsecure - src/core/channelz/channel_trace.cc - src/core/channelz/channelz.cc -@@ -3547,6 +3559,8 @@ if(gRPC_INSTALL) + src/core/call/call_arena_allocator.cc + src/core/call/call_filters.cc +@@ -3951,6 +3963,8 @@ if(gRPC_INSTALL) ) endif() @@ -93,7 +94,7 @@ index 2565dc5c84..94f8fd3e93 100644 if(gRPC_BUILD_TESTS) add_library(gtest -@@ -3621,6 +3635,8 @@ target_link_libraries(gtest +@@ -4025,6 +4039,8 @@ target_link_libraries(gtest endif() @@ -102,7 +103,24 @@ index 2565dc5c84..94f8fd3e93 100644 add_library(upb_base_lib third_party/upb/upb/base/status.c ) -@@ -4108,6 +4124,8 @@ if(gRPC_INSTALL) +@@ -4641,6 +4657,7 @@ if(gRPC_INSTALL) + ) + endif() + ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY + + add_library(utf8_range_lib + third_party/utf8_range/utf8_range.c +@@ -4681,7 +4698,7 @@ target_link_libraries(utf8_range_lib + ${_gRPC_ALLTARGETS_LIBRARIES} + ) + +- ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + + if(gRPC_INSTALL) + install(TARGETS utf8_range_lib EXPORT gRPCTargets +@@ -4692,6 +4709,8 @@ if(gRPC_INSTALL) ) endif() @@ -111,16 +129,16 @@ index 2565dc5c84..94f8fd3e93 100644 if(gRPC_BUILD_TESTS) if(gRPC_BUILD_CODEGEN) -@@ -4193,6 +4211,8 @@ endif() +@@ -4784,6 +4803,8 @@ endif() endif() +if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + add_library(grpc++ - src/core/ext/transport/binder/client/binder_connector.cc - src/core/ext/transport/binder/client/channel_create.cc -@@ -4684,6 +4704,7 @@ if(gRPC_INSTALL) + src/cpp/client/call_credentials.cc + src/cpp/client/channel_cc.cc +@@ -5263,6 +5284,7 @@ if(gRPC_INSTALL) ) endif() @@ -128,7 +146,7 @@ index 2565dc5c84..94f8fd3e93 100644 if(gRPC_BUILD_CODEGEN) add_library(grpc++_reflection ${_gRPC_STATIC_WIN32} -@@ -4967,6 +4988,8 @@ target_link_libraries(grpc++_test_util +@@ -5537,6 +5559,8 @@ target_link_libraries(grpc++_test_util endif() @@ -137,7 +155,7 @@ index 2565dc5c84..94f8fd3e93 100644 add_library(grpc++_unsecure src/cpp/client/call_credentials.cc src/cpp/client/channel_cc.cc -@@ -5707,6 +5730,7 @@ if(gRPC_INSTALL) +@@ -6285,6 +6309,7 @@ if(gRPC_INSTALL) ) endif() @@ -145,7 +163,7 @@ index 2565dc5c84..94f8fd3e93 100644 add_library(grpc_plugin_support src/compiler/cpp_generator.cc -@@ -5769,7 +5793,7 @@ foreach(_hdr +@@ -6385,7 +6410,7 @@ foreach(_hdr endforeach() @@ -154,7 +172,7 @@ index 2565dc5c84..94f8fd3e93 100644 install(TARGETS grpc_plugin_support EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -@@ -16520,7 +16544,7 @@ target_link_libraries(grpc_completion_queue_test +@@ -18827,7 +18852,7 @@ target_link_libraries(grpc_completion_queue_test endif() @@ -163,7 +181,7 @@ index 2565dc5c84..94f8fd3e93 100644 add_executable(grpc_cpp_plugin src/compiler/cpp_plugin.cc -@@ -16548,7 +16572,7 @@ target_link_libraries(grpc_cpp_plugin +@@ -18855,7 +18880,7 @@ target_link_libraries(grpc_cpp_plugin @@ -172,7 +190,7 @@ index 2565dc5c84..94f8fd3e93 100644 install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -@@ -37968,7 +37992,7 @@ endif() +@@ -51904,7 +51929,7 @@ endif() @@ -181,13 +199,12 @@ index 2565dc5c84..94f8fd3e93 100644 if(gRPC_INSTALL) install(EXPORT gRPCTargets -@@ -38089,3 +38113,5 @@ generate_pkgconfig( +@@ -52025,3 +52050,5 @@ generate_pkgconfig( "-lgrpcpp_otel_plugin" - "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib" + "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib" "grpcpp_otel_plugin.pc") + +endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY -\ No newline at end of file -- -2.34.1 +2.43.0 diff --git a/package/grpc/0003-disable-unconditionally-downloading-api-repos.patch b/package/grpc/0003-disable-unconditionally-downloading-api-repos.patch deleted file mode 100644 index 0cd5012b26..0000000000 --- a/package/grpc/0003-disable-unconditionally-downloading-api-repos.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2a73f6439b6d745b2cbfff120dc7adc555400247 Mon Sep 17 00:00:00 2001 -From: Michael Nosthoff <buildroot@heine.tech> -Date: Fri, 22 Jul 2022 08:49:48 +0200 -Subject: [PATCH] disable unconditionally downloading api repos - -The Buildroot build doesn't need those submodules, so disable them hard -for now. - -See https://github.com/grpc/grpc/issues/30385 - -Signed-off-by: Michael Nosthoff <buildroot@heine.tech> ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 94f8fd3e93..df43d2e193 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -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 AND gRPC_DOWNLOAD_ARCHIVES) - # Download the archive via HTTP, validate the checksum, and extract to third_party/envoy-api. -@@ -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_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} ws2_32 crypt32) --- -2.34.1 - diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index 08aada1454..130e098c9e 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 79ed4ab72fa9589b20f8b0b76c16e353e4cfec1d773d33afad605d97b5682c61 grpc-1.66.1.tar.gz +sha256 0af37b800953130b47c075b56683ee60bdc3eda3c37fc6004193f5b569758204 grpc-1.76.0.tar.gz sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index d8681f33ce..77cbc366f0 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.66.1 +GRPC_VERSION = 1.76.0 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 @@ -36,7 +36,8 @@ GRPC_CONF_OPTS = \ -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ - -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF + -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF \ + -DgRPC_DOWNLOAD_ARCHIVES=OFF ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) GRPC_DEPENDENCIES += libexecinfo @@ -81,7 +82,8 @@ HOST_GRPC_CONF_OPTS = \ -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ - -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF + -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF \ + -DgRPC_DOWNLOAD_ARCHIVES=OFF $(eval $(cmake-package)) $(eval $(host-cmake-package)) -- 2.43.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc 2025-12-09 20:18 [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc Michael Nosthoff via buildroot ` (2 preceding siblings ...) 2025-12-09 20:18 ` [Buildroot] [PATCH 4/4] package/grpc: bump to version 1.76.0 Michael Nosthoff via buildroot @ 2025-12-28 13:57 ` Thomas Petazzoni via buildroot 2025-12-28 14:34 ` Michael Nosthoff via buildroot 3 siblings, 1 reply; 8+ messages in thread From: Thomas Petazzoni via buildroot @ 2025-12-28 13:57 UTC (permalink / raw) To: Michael Nosthoff via buildroot; +Cc: Asaf Kahlon Hello Michael, On Tue, 9 Dec 2025 21:18:42 +0100 Michael Nosthoff via buildroot <buildroot@buildroot.org> wrote: > abseil and hence protobuf/grpc now need C++17. > > Signed-off-by: Michael Nosthoff <buildroot@heine.tech> Could you provide more details on which commit introduced this regression, and a defconfig that exhibits the build failure? Indeed, I tried: BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_COLLECTD=y # BR2_PACKAGE_COLLECTD_LOGFILE is not set # BR2_PACKAGE_COLLECTD_SYSLOG is not set BR2_PACKAGE_COLLECTD_GRPC=y # BR2_TARGET_ROOTFS_TAR is not set And it builds just fine. I believe the fix is correct, but the commit log doesn't provide enough details, which are needed to understand whether this fix needs to be backported to one of our stable branches. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc 2025-12-28 13:57 ` [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc Thomas Petazzoni via buildroot @ 2025-12-28 14:34 ` Michael Nosthoff via buildroot 2025-12-28 22:27 ` Thomas Petazzoni via buildroot 0 siblings, 1 reply; 8+ messages in thread From: Michael Nosthoff via buildroot @ 2025-12-28 14:34 UTC (permalink / raw) To: Thomas Petazzoni; +Cc: Asaf Kahlon, Michael Nosthoff via buildroot Hi Thomas, On Sunday, December 28, 2025 14:57 CET, Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > Hello Michael, > > On Tue, 9 Dec 2025 21:18:42 +0100 > Michael Nosthoff via buildroot <buildroot@buildroot.org> wrote: > > > abseil and hence protobuf/grpc now need C++17. > > > > Signed-off-by: Michael Nosthoff <buildroot@heine.tech> > > Could you provide more details on which commit introduced this > regression, and a defconfig that exhibits the build failure? > the "breakage" is introduced in the series which this commit is part of when bumping grpc & abseil. So maybe the title could have been better. I just oriented on the title of the previous commit which bumped collectd to C++14 and is also named so in the collectd repo. Regards, Michael _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc 2025-12-28 14:34 ` Michael Nosthoff via buildroot @ 2025-12-28 22:27 ` Thomas Petazzoni via buildroot 2025-12-28 23:17 ` Michael Nosthoff via buildroot 0 siblings, 1 reply; 8+ messages in thread From: Thomas Petazzoni via buildroot @ 2025-12-28 22:27 UTC (permalink / raw) To: Michael Nosthoff; +Cc: Michael Nosthoff via buildroot, Asaf Kahlon Hello, On Sun, 28 Dec 2025 15:34:29 +0100 "Michael Nosthoff" <buildroot@heine.tech> wrote: > the "breakage" is introduced in the series which this commit is part > of when bumping grpc & abseil. So maybe the title could have been > better. I just oriented on the title of the previous commit which > bumped collectd to C++14 and is also named so in the collectd repo. So you mean that in the current master there is no breakage, and it's only the fact that your series is bumping abseil and grpc that some breakage will be introduced, and that you therefore fix before the version bumps? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc 2025-12-28 22:27 ` Thomas Petazzoni via buildroot @ 2025-12-28 23:17 ` Michael Nosthoff via buildroot 0 siblings, 0 replies; 8+ messages in thread From: Michael Nosthoff via buildroot @ 2025-12-28 23:17 UTC (permalink / raw) To: Thomas Petazzoni; +Cc: Asaf Kahlon, Michael Nosthoff via buildroot Hi, On Sunday, December 28, 2025 23:27 CET, Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > Hello, > > On Sun, 28 Dec 2025 15:34:29 +0100 > "Michael Nosthoff" <buildroot@heine.tech> wrote: > > > the "breakage" is introduced in the series which this commit is part > > of when bumping grpc & abseil. So maybe the title could have been > > better. I just oriented on the title of the previous commit which > > bumped collectd to C++14 and is also named so in the collectd repo. > > So you mean that in the current master there is no breakage, and it's > only the fact that your series is bumping abseil and grpc that some > breakage will be introduced, and that you therefore fix before the > version bumps? > correct. This is why it's part of the series bumping abseil/protobuf/grpc. I just reordered the series before sending and missed to reword this commit to be more intuitive. I can resend this next year with reworked wording when I'm back at my working setup. Regards, Michael > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-12-28 23:17 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-09 20:18 [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc Michael Nosthoff via buildroot
2025-12-09 20:18 ` [Buildroot] [PATCH 2/4] package/libabseil-cpp: bump to version 20250814.1 Michael Nosthoff via buildroot
2025-12-09 20:18 ` [Buildroot] [PATCH 3/4] package/{|python-}protobuf: bump to version 33.2 Michael Nosthoff via buildroot
2025-12-09 20:18 ` [Buildroot] [PATCH 4/4] package/grpc: bump to version 1.76.0 Michael Nosthoff via buildroot
2025-12-28 13:57 ` [Buildroot] [PATCH 1/4] package/collectd: fix build with grpc Thomas Petazzoni via buildroot
2025-12-28 14:34 ` Michael Nosthoff via buildroot
2025-12-28 22:27 ` Thomas Petazzoni via buildroot
2025-12-28 23:17 ` Michael Nosthoff via buildroot
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.