From 5f623833878cbc6684f407c3663a64e964413c5f Mon Sep 17 00:00:00 2001 From: Pavel Geler Date: Thu, 17 Feb 2022 20:02:19 -0500 Subject: [PATCH 1/3] add grpc package version 1.44.0 --- recipes/grpc/all/conandata.yml | 6 +++++ recipes/grpc/all/conanfile.py | 2 +- .../v1.44.x/001-disable-cppstd-override.patch | 26 +++++++++++++++++++ recipes/grpc/config.yml | 2 ++ 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 recipes/grpc/all/patches/v1.44.x/001-disable-cppstd-override.patch diff --git a/recipes/grpc/all/conandata.yml b/recipes/grpc/all/conandata.yml index 6c59e799f5f1f..df17ba4c151eb 100644 --- a/recipes/grpc/all/conandata.yml +++ b/recipes/grpc/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.44.0": + url: "https://github.com/grpc/grpc/archive/refs/tags/v1.44.0.tar.gz" + sha256: "8c05641b9f91cbc92f51cc4a5b3a226788d7a63f20af4ca7aaca50d92cc94a0d" "1.43.0": url: "https://github.com/grpc/grpc/archive/refs/tags/v1.43.0.tar.gz" sha256: "9647220c699cea4dafa92ec0917c25c7812be51a18143af047e20f3fb05adddc" @@ -30,6 +33,9 @@ sources: url: https://github.com/grpc/grpc/archive/refs/tags/v1.37.0.tar.gz sha256: "c2dc8e876ea12052d6dd16704492fd8921df8c6d38c70c4708da332cf116df22" patches: + "1.44.0": + - patch_file: "patches/v1.44.x/001-disable-cppstd-override.patch" + base_path: "source_subfolder" "1.43.0": - patch_file: "patches/v1.43.x/001-disable-cppstd-override.patch" base_path: "source_subfolder" diff --git a/recipes/grpc/all/conanfile.py b/recipes/grpc/all/conanfile.py index a8373fbaae1ad..03d92335f4c02 100644 --- a/recipes/grpc/all/conanfile.py +++ b/recipes/grpc/all/conanfile.py @@ -67,7 +67,7 @@ def config_options(self): def requirements(self): self.requires('zlib/1.2.11') self.requires('openssl/1.1.1m') - self.requires('protobuf/3.17.1') + self.requires('protobuf/3.19.2') self.requires('c-ares/1.17.2') self.requires('abseil/20211102.0') self.requires('re2/20211101') diff --git a/recipes/grpc/all/patches/v1.44.x/001-disable-cppstd-override.patch b/recipes/grpc/all/patches/v1.44.x/001-disable-cppstd-override.patch new file mode 100644 index 0000000000000..a260124675947 --- /dev/null +++ b/recipes/grpc/all/patches/v1.44.x/001-disable-cppstd-override.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7a97604b75..7ae815042f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -222,21 +222,6 @@ if (NOT DEFINED CMAKE_C_STANDARD) + set(CMAKE_C_STANDARD 99) + endif() + +-# Add c++11 flags +-if (NOT DEFINED CMAKE_CXX_STANDARD) +- set(CMAKE_CXX_STANDARD 11) +-else() +- if (CMAKE_CXX_STANDARD LESS 11) +- message(FATAL_ERROR "CMAKE_CXX_STANDARD is less than 11, please specify at least SET(CMAKE_CXX_STANDARD 11)") +- endif() +-endif() +-if (NOT DEFINED CMAKE_CXX_STANDARD_REQUIRED) +- set(CMAKE_CXX_STANDARD_REQUIRED ON) +-endif() +-if (NOT DEFINED CMAKE_CXX_EXTENSIONS) +- set(CMAKE_CXX_EXTENSIONS OFF) +-endif() +- + if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) + set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) + endif() diff --git a/recipes/grpc/config.yml b/recipes/grpc/config.yml index 5e89027bc4223..abf7c46881712 100644 --- a/recipes/grpc/config.yml +++ b/recipes/grpc/config.yml @@ -1,4 +1,6 @@ versions: + "1.44.0": + folder: "all" "1.43.0": folder: "all" "1.42.0": From 81f05139b9e62ff1be6be2b9c32235b760462fd2 Mon Sep 17 00:00:00 2001 From: Pavel Geler Date: Fri, 18 Feb 2022 06:54:38 -0500 Subject: [PATCH 2/3] fix dependencies --- recipes/grpc/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/grpc/all/conanfile.py b/recipes/grpc/all/conanfile.py index 03d92335f4c02..1ac50bb4ff6fa 100644 --- a/recipes/grpc/all/conanfile.py +++ b/recipes/grpc/all/conanfile.py @@ -86,7 +86,7 @@ def validate(self): def build_requirements(self): if hasattr(self, "settings_build"): - self.build_requires('protobuf/3.17.1') + self.build_requires('protobuf/3.19.2') # when cross compiling we need pre compiled grpc plugins for protoc if tools.cross_building(self): self.build_requires('grpc/{}'.format(self.version)) @@ -216,7 +216,7 @@ def package_info(self): if not self.options.secure: self.cpp_info.components["grpc_unsecure"].names["cmake_find_package"] = "grpc_unsecure" self.cpp_info.components["grpc_unsecure"].names["cmake_find_package_multi"] = "grpc_unsecure" - self.cpp_info.components["grpc_unsecure"].requires = ["zlib::zlib", "c-ares::cares", "address_sorting", "re2::re2", "upb", "abseil::absl_flat_hash_map", "abseil::absl_inlined_vector", "abseil::absl_statusor", "gpr", "address_sorting", "upb"] + self.cpp_info.components["grpc_unsecure"].requires = ["zlib::zlib", "c-ares::cares", "address_sorting", "re2::re2", "upb", "abseil::absl_flat_hash_map", "abseil::absl_inlined_vector", "abseil::absl_statusor", "abseil::absl_random_random", "gpr", "address_sorting", "upb"] if tools.is_apple_os(self.settings.os): self.cpp_info.components["grpc_unsecure"].frameworks = ["CoreFoundation"] self.cpp_info.components["grpc_unsecure"].system_libs = _system_libs From cc8389bd6a07d02cc8951abcdb224882ad185440 Mon Sep 17 00:00:00 2001 From: Pavel Geler Date: Wed, 23 Feb 2022 15:40:00 -0500 Subject: [PATCH 3/3] fix --- recipes/grpc/all/conanfile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/grpc/all/conanfile.py b/recipes/grpc/all/conanfile.py index 5f65f6f05a548..4dc826b601241 100644 --- a/recipes/grpc/all/conanfile.py +++ b/recipes/grpc/all/conanfile.py @@ -354,6 +354,7 @@ def corefoundation(): "address_sorting", "gpr", "upb", "abseil::absl_flat_hash_map", "abseil::absl_inlined_vector", "abseil::absl_statusor", "c-ares::cares", "re2::re2", "zlib::zlib", + "abseil::absl_random_random", ], "system_libs": libm() + pthread() + crypt32() + ws2_32() + wsock32(), "frameworks": corefoundation(),