[Buildroot] [PATCH 1/1] package/grpc: bump to version 1.45.2
Michael Nosthoff
buildroot at heine.tech
Mon Apr 25 08:05:44 UTC 2022
grpc now requires gcc >= 5.1
see https://groups.google.com/g/grpc-io/c/Plvp29818BE
Signed-off-by: Michael Nosthoff <buildroot at heine.tech>
---
package/grpc/Config.in | 6 +++---
package/grpc/grpc.hash | 2 +-
package/grpc/grpc.mk | 10 +---------
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/package/grpc/Config.in b/package/grpc/Config.in
index ad3ddbcf19..adba1cea52 100644
--- a/package/grpc/Config.in
+++ b/package/grpc/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_GRPC
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf
- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # protobuf, re2, libabseil-cpp
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5_1
depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
@@ -19,9 +19,9 @@ config BR2_PACKAGE_GRPC
http://github.com/grpc/grpc
-comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9"
+comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 5.1"
depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
- || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+ || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5_1
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash
index 6db2acd759..9e3a225a51 100644
--- a/package/grpc/grpc.hash
+++ b/package/grpc/grpc.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 8c05641b9f91cbc92f51cc4a5b3a226788d7a63f20af4ca7aaca50d92cc94a0d grpc-1.44.0.tar.gz
+sha256 e18b16f7976aab9a36c14c38180f042bb0fd196b75c9fd6a20a2b5f934876ad6 grpc-1.45.2.tar.gz
sha256 277adcc1dcef8359b1efb48e628635f88b40be8fbd64e82fd0169930d135d7a5 LICENSE
diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk
index 9138b4ea59..2f037b5d59 100644
--- a/package/grpc/grpc.mk
+++ b/package/grpc/grpc.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GRPC_VERSION = 1.44.0
+GRPC_VERSION = 1.45.2
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
@@ -63,14 +63,6 @@ GRPC_CFLAGS += -O0
GRPC_CXXFLAGS += -O0
endif
-# Toolchains older than gcc5 will fail to compile with -0s due to:
-# error: failure memory model cannot be stronger than success memory model for
-# '__atomic_compare_exchange', so we use -O2 in these cases
-ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5):$(BR2_OPTIMIZE_S),:y)
-GRPC_CFLAGS += -O2
-GRPC_CXXFLAGS += -O2
-endif
-
GRPC_CONF_OPTS += \
-DCMAKE_C_FLAGS="$(GRPC_CFLAGS)" \
-DCMAKE_CXX_FLAGS="$(GRPC_CXXFLAGS)"
--
2.25.1
More information about the buildroot
mailing list