Skip to content

Commit

Permalink
(#9417) add grpc package version 1.44.0
Browse files Browse the repository at this point in the history
* add grpc package version 1.44.0

* fix dependencies

* fix
  • Loading branch information
pgeler authored Feb 27, 2022
1 parent df97ae5 commit f211970
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 2 deletions.
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
5 changes: 3 additions & 2 deletions recipes/grpc/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def configure(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 Down Expand Up @@ -114,7 +114,7 @@ def package_id(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 @@ -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(),
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

0 comments on commit f211970

Please sign in to comment.