Skip to contentSkip to conversation

package/collectd: enforce c++17

PATCH Applied Michael Nosthoff via buildroot 1 participant 6 messages Jan 7 – Feb 2

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 package/collectd: enforce c++17

abseil since 20250512.0 and hence protobuf/grpc now need C++17. collectd in the currently used version sets C++ to 11.
So bump the C++ Version used when building collectd like it was done before to bump it to C++14 in commit 5fcc4e19602ad37d018ccf3543fe82a291837f43 with patch 0002.

--

V2: reworded to be more clear that it is not fixing a currently happening issue

---
 ...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
package/collectd/0005-configure.ax-fix-grpc-build-2025.patch new file +73 -0
new file mode 100644
index 0000000000..e750483135
@@ -0,0 +1,73 @@
+From 42b2ede4dadcf88293e408bcdf5645995b61b148 Mon Sep 17 00:00:00 2001
+From: Michael Nosthoff <[email protected]>
+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 <[email protected]>
+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"
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH v2 2/3 package/libabseil-cpp: bump to version 20250814.1

- 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

---
 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(-)
package/libabseil-cpp/Config.in +1 -1
index 7b65ec40d0..6bbe9518b2 100644
@@ -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
package/libabseil-cpp/libabseil-cpp.hash +1 -1
index 701801a7c4..e1b8763e2a 100644
@@ -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
package/libabseil-cpp/libabseil-cpp.mk +3 -3
index 34d62c4dd1..fe97c1c2f3 100644
@@ -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
 
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH v2 2/3] package/libabseil-cpp: bump to version 20250814.1

Quoted 8 lines · Michael Nosthoff via 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

Applied to master, 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
#3 lore raw

PATCH v2 3/3 package/grpc: bump to version 1.76.0

In reply to Michael Nosthoff via buildroot

- 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

Fixes 2d19a0b332dc17c18533b "package/{python-}protobuf: bump to version 33.2"

--

V2: added "Fixes" part

The protobuf bump to 33.2 was initially contained in this series. Another standalone patch was then applied in commit 2d19a0b332dc17c18533b instead. Which broke the build of grpc 1.66.1 which relies on an older protobuf version.
This can be observed with this defconfig:

BR2_arm=y
BR2_cortex_a53=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
BR2_PACKAGE_COLLECTD=y
BR2_PACKAGE_COLLECTD_GRPC=y

---
 ...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
package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch +7 -7
index e8e211758a..909a7fb5b0 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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
 
package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch +47 -30

196 lines not on this page · raw message

package/grpc/0003-disable-unconditionally-downloading-api-repos.patch deleted +0 -38
deleted file mode 100644
index 0cd5012b26..0000000000
@@ -1,38 +0,0 @@
-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
-
-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 <[email protected]>
----
- 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
-
package/grpc/grpc.hash +1 -1
index 08aada1454..130e098c9e 100644
@@ -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
package/grpc/grpc.mk +5 -3
index d8681f33ce..77cbc366f0 100644
@@ -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))
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

Re: [Buildroot] [PATCH v2 3/3] package/grpc: bump to version 1.76.0

Hello,

Quoted 31 lines · Michael Nosthoff via buildroot

- 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

Fixes 2d19a0b332dc17c18533b "package/{python-}protobuf: bump to version 33.2"

--

V2: added "Fixes" part

The protobuf bump to 33.2 was initially contained in this series. Another standalone patch was then applied in commit 2d19a0b332dc17c18533b instead. Which broke the build of grpc 1.66.1 which relies on an older protobuf version.
This can be observed with this defconfig:

Quoted 6 lines

BR2_arm=y
BR2_cortex_a53=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
BR2_PACKAGE_COLLECTD=y
BR2_PACKAGE_COLLECTD_GRPC=y

I moved a bunch of this explanation in the commit message itself, as it was useful. Also, I've added a reference to the autobuilder failure that this bump is fixing. And of course, I applied to master.

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
#5 lore raw
In reply to Michael Nosthoff via buildroot
Quoted 7 lines · Michael Nosthoff via buildroot

abseil since 20250512.0 and hence protobuf/grpc now need C++17. collectd in the currently used version sets C++ to 11.
So bump the C++ Version used when building collectd like it was done before to bump it to C++14 in commit 5fcc4e19602ad37d018ccf3543fe82a291837f43 with patch 0002.

I've significantly reworded the commit message, which I believe was still quite confusing, and then I applied to master. 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