Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add grpc package version 1.44.0 #9417

Merged
merged 5 commits into from
Feb 27, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions recipes/grpc/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions recipes/grpc/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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))
Expand Down Expand Up @@ -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
Expand Down
26 changes: 26 additions & 0 deletions recipes/grpc/all/patches/v1.44.x/001-disable-cppstd-override.patch
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 2 additions & 0 deletions recipes/grpc/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.44.0":
folder: "all"
"1.43.0":
folder: "all"
"1.42.0":
Expand Down