From d6f10128f9344cde85bf645d0a137cb4b074cdfd Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 21 Feb 2024 00:43:15 +0000 Subject: [PATCH 1/7] updated v1.62.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6716632d..548e3119 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.61.1" %} +{% set version = "1.62.0" %} # core package & vendored libs use different version scheme than CPP libs, see # https://github.com/grpc/grpc/blob/v1.48.1/CMakeLists.txt#L28-L32 @@ -19,7 +19,7 @@ package: source: url: https://github.com/grpc/grpc/archive/v{{ version.replace(".pre", "-pre") }}.tar.gz - sha256: 6dadc0420ad2d4b8ac49f516830f72feae3764bf83decc8d7c3a871eca1a0843 + sha256: f40bde4ce2f31760f65dc49a2f50876f59077026494e67dccf23992548b1b04f patches: - patches/0001-windows-ssl-lib-names.patch # [win] - patches/0002-fix-win-setup-cmds.patch # [win] @@ -36,7 +36,7 @@ source: - patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch build: - number: 1 + number: 0 outputs: - name: libgrpc From 5fd817494609e5fae573e32472a627f77f03e76e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 28 Feb 2024 16:02:46 +0100 Subject: [PATCH 2/7] Update patches Co-Authored-By: H. Vetinari --- recipe/meta.yaml | 4 +- .../patches/0001-windows-ssl-lib-names.patch | 6 +-- recipe/patches/0002-fix-win-setup-cmds.patch | 29 +++++++------ recipe/patches/0003-Link-against-grpc.patch | 8 ++-- .../0004-force-protoc-executable.patch | 2 +- .../0005-switch-to-C-17-for-grpcio.patch | 41 +++++++++++-------- recipe/patches/0006-fix-abseil-setup.patch | 6 +-- ...inkage-of-c-ares-re2-zlib-as-private.patch | 16 +++++--- .../0008-link-grpc-_unsecure-to-grpc.patch | 6 +-- ...-missing-DLL-exports-in-vendored-upb.patch | 8 ++-- 10 files changed, 69 insertions(+), 57 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 548e3119..952d19fc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,8 +21,8 @@ source: url: https://github.com/grpc/grpc/archive/v{{ version.replace(".pre", "-pre") }}.tar.gz sha256: f40bde4ce2f31760f65dc49a2f50876f59077026494e67dccf23992548b1b04f patches: - - patches/0001-windows-ssl-lib-names.patch # [win] - - patches/0002-fix-win-setup-cmds.patch # [win] + - patches/0001-windows-ssl-lib-names.patch + - patches/0002-fix-win-setup-cmds.patch - patches/0003-Link-against-grpc.patch - patches/0004-force-protoc-executable.patch - patches/0005-switch-to-C-17-for-grpcio.patch diff --git a/recipe/patches/0001-windows-ssl-lib-names.patch b/recipe/patches/0001-windows-ssl-lib-names.patch index 2990a32e..98c16c83 100644 --- a/recipe/patches/0001-windows-ssl-lib-names.patch +++ b/recipe/patches/0001-windows-ssl-lib-names.patch @@ -1,4 +1,4 @@ -From 70d8f5bf4fea8ec180f7d99d0fce367f9d64a981 Mon Sep 17 00:00:00 2001 +From c6556038b1e913b84bd6427fa71457b2aa2f8577 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Mon, 17 Feb 2020 15:45:06 -0600 Subject: [PATCH 1/9] windows ssl lib names @@ -11,10 +11,10 @@ Co-Authored-By: Marius van Niekerk 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index 97c1dcec54..82de367535 100644 +index 6ebfae1811..07df8358d0 100644 --- a/setup.py +++ b/setup.py -@@ -366,10 +366,10 @@ if "win32" in sys.platform: +@@ -350,10 +350,10 @@ if "win32" in sys.platform: "ws2_32", ) if BUILD_WITH_SYSTEM_OPENSSL: diff --git a/recipe/patches/0002-fix-win-setup-cmds.patch b/recipe/patches/0002-fix-win-setup-cmds.patch index 01430e49..5afd6dbd 100644 --- a/recipe/patches/0002-fix-win-setup-cmds.patch +++ b/recipe/patches/0002-fix-win-setup-cmds.patch @@ -1,4 +1,4 @@ -From 91b1278c6be61939d488114f145f98334415eb3e Mon Sep 17 00:00:00 2001 +From ef1656b4c28aea56b64ddcbebc4d9b08f591b8d7 Mon Sep 17 00:00:00 2001 From: Mike Sarahan Date: Tue, 18 Feb 2020 13:53:05 -0600 Subject: [PATCH 2/9] fix win setup cmds @@ -8,15 +8,15 @@ Co-Authored-By: Nicholas Bollweg Co-Authored-By: Marius van Niekerk Co-Authored-By: H. Vetinari --- - setup.py | 7 +++---- + setup.py | 6 +++--- src/python/grpcio/commands.py | 2 ++ - 2 files changed, 5 insertions(+), 4 deletions(-) + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py -index 82de367535..47e1f25d7f 100644 +index 07df8358d0..dfe4c9caa7 100644 --- a/setup.py +++ b/setup.py -@@ -214,6 +214,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value( +@@ -208,6 +208,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value( def check_linker_need_libatomic(): @@ -26,17 +26,16 @@ index 82de367535..47e1f25d7f 100644 """Test if linker on system needs libatomic.""" code_test = ( b"#include \n" -@@ -268,10 +271,6 @@ if EXTRA_ENV_COMPILE_ARGS is None: - EXTRA_ENV_COMPILE_ARGS += ( - " -D_ftime=_ftime64 -D_timeb=__timeb64" - ) -- else: -- # We need to statically link the C++ Runtime, only the C runtime is -- # available dynamically -- EXTRA_ENV_COMPILE_ARGS += " /MT" +@@ -249,9 +252,6 @@ if EXTRA_ENV_COMPILE_ARGS is None: + if "win32" in sys.platform: + # MSVC by defaults uses C++14 so C11 needs to be specified. + EXTRA_ENV_COMPILE_ARGS += " /std:c11" +- # We need to statically link the C++ Runtime, only the C runtime is +- # available dynamically +- EXTRA_ENV_COMPILE_ARGS += " /MT" elif "linux" in sys.platform: - EXTRA_ENV_COMPILE_ARGS += ( - " -fvisibility=hidden -fno-wrapv -fno-exceptions" + # GCC by defaults uses C17 so only C++14 needs to be specified. + EXTRA_ENV_COMPILE_ARGS += " -std=c++14" diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py index 98324c955f..484aef0d8b 100644 --- a/src/python/grpcio/commands.py diff --git a/recipe/patches/0003-Link-against-grpc.patch b/recipe/patches/0003-Link-against-grpc.patch index cde71ed2..4c8c6b0c 100644 --- a/recipe/patches/0003-Link-against-grpc.patch +++ b/recipe/patches/0003-Link-against-grpc.patch @@ -1,4 +1,4 @@ -From f401f5fdc9afe592f7ff232c6466f8c36c7e58e7 Mon Sep 17 00:00:00 2001 +From 489094faf898b1add9c636131ae66e82c6751ef4 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Mon, 13 Jun 2022 17:13:07 -0400 Subject: [PATCH 3/9] Link against grpc @@ -9,7 +9,7 @@ Co-Authored-By: H. Vetinari 1 file changed, 11 insertions(+) diff --git a/setup.py b/setup.py -index 47e1f25d7f..00dfd3419a 100644 +index dfe4c9caa7..0b719cc86d 100644 --- a/setup.py +++ b/setup.py @@ -179,6 +179,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value( @@ -21,7 +21,7 @@ index 47e1f25d7f..00dfd3419a 100644 # For local development use only: This skips building gRPC Core and its # dependencies, including protobuf and boringssl. This allows "incremental" # compilation by first building gRPC Core using make, then building only the -@@ -379,6 +381,12 @@ if BUILD_WITH_SYSTEM_ABSL: +@@ -364,6 +366,12 @@ if BUILD_WITH_SYSTEM_ABSL: EXTENSION_LIBRARIES += tuple( lib.stem[3:] for lib in pathlib.Path("/usr").glob("lib*/libabsl_*.so") ) @@ -34,7 +34,7 @@ index 47e1f25d7f..00dfd3419a 100644 DEFINE_MACROS = (("_WIN32_WINNT", 0x600),) asm_files = [] -@@ -504,6 +512,9 @@ def cython_extensions_and_necessity(): +@@ -486,6 +494,9 @@ def cython_extensions_and_necessity(): prefix + "libgrpc.a", ] core_c_files = [] diff --git a/recipe/patches/0004-force-protoc-executable.patch b/recipe/patches/0004-force-protoc-executable.patch index 317f24aa..17e1ecd1 100644 --- a/recipe/patches/0004-force-protoc-executable.patch +++ b/recipe/patches/0004-force-protoc-executable.patch @@ -1,4 +1,4 @@ -From dab5f8bf11094b43a411b1e55f0a1ed1d486dc9e Mon Sep 17 00:00:00 2001 +From b3ebb02d157e1a812229a95c99b5878641e9e4a5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 11 Sep 2020 14:20:04 +0200 Subject: [PATCH 4/9] force protoc executable diff --git a/recipe/patches/0005-switch-to-C-17-for-grpcio.patch b/recipe/patches/0005-switch-to-C-17-for-grpcio.patch index 9121deed..b92dc917 100644 --- a/recipe/patches/0005-switch-to-C-17-for-grpcio.patch +++ b/recipe/patches/0005-switch-to-C-17-for-grpcio.patch @@ -1,17 +1,17 @@ -From b1a1503ac5730c13f1783d29b0951c82a2dea0d6 Mon Sep 17 00:00:00 2001 +From 2a14ece3b421e6e0578252a29ed6a2792c870831 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 3 Sep 2022 19:23:15 +0200 Subject: [PATCH 5/9] switch to C++17 for grpcio --- - setup.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) + setup.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py -index 00dfd3419a..c0b391ea2c 100644 +index 0b719cc86d..7ba0ca029e 100644 --- a/setup.py +++ b/setup.py -@@ -226,7 +226,7 @@ def check_linker_need_libatomic(): +@@ -220,7 +220,7 @@ def check_linker_need_libatomic(): ) cxx = shlex.split(os.environ.get("CXX", "c++")) cpp_test = subprocess.Popen( @@ -20,7 +20,7 @@ index 00dfd3419a..c0b391ea2c 100644 stdin=PIPE, stdout=PIPE, stderr=PIPE, -@@ -237,7 +237,7 @@ def check_linker_need_libatomic(): +@@ -231,7 +231,7 @@ def check_linker_need_libatomic(): # Double-check to see if -latomic actually can solve the problem. # https://github.com/grpc/grpc/issues/22491 cpp_test = subprocess.Popen( @@ -29,14 +29,23 @@ index 00dfd3419a..c0b391ea2c 100644 stdin=PIPE, stdout=PIPE, stderr=PIPE, -@@ -256,8 +256,9 @@ def check_linker_need_libatomic(): - EXTRA_ENV_COMPILE_ARGS = os.environ.get("GRPC_PYTHON_CFLAGS", None) - EXTRA_ENV_LINK_ARGS = os.environ.get("GRPC_PYTHON_LDFLAGS", None) - if EXTRA_ENV_COMPILE_ARGS is None: -- EXTRA_ENV_COMPILE_ARGS = " -std=c++14" -+ EXTRA_ENV_COMPILE_ARGS = ' -std=c++17' +@@ -253,16 +253,16 @@ if EXTRA_ENV_COMPILE_ARGS is None: + EXTRA_ENV_COMPILE_ARGS = "" if "win32" in sys.platform: -+ EXTRA_ENV_COMPILE_ARGS = ' /std:c++17' - if sys.version_info < (3, 5): - EXTRA_ENV_COMPILE_ARGS += " -D_hypot=hypot" - # We use define flags here and don't directly add to DEFINE_MACROS below to + # MSVC by defaults uses C++14 so C11 needs to be specified. +- EXTRA_ENV_COMPILE_ARGS += " /std:c11" ++ EXTRA_ENV_COMPILE_ARGS += " /std:c11 /std:c++17" + elif "linux" in sys.platform: + # GCC by defaults uses C17 so only C++14 needs to be specified. +- EXTRA_ENV_COMPILE_ARGS += " -std=c++14" ++ EXTRA_ENV_COMPILE_ARGS += " -std=c++17" + EXTRA_ENV_COMPILE_ARGS += ( + " -fvisibility=hidden -fno-wrapv -fno-exceptions" + ) + elif "darwin" in sys.platform: + # AppleClang by defaults uses C17 so only C++14 needs to be specified. +- EXTRA_ENV_COMPILE_ARGS += " -std=c++14" ++ EXTRA_ENV_COMPILE_ARGS += " -std=c++17" + EXTRA_ENV_COMPILE_ARGS += ( + " -stdlib=libc++ -fvisibility=hidden -fno-wrapv -fno-exceptions" + " -DHAVE_UNISTD_H" diff --git a/recipe/patches/0006-fix-abseil-setup.patch b/recipe/patches/0006-fix-abseil-setup.patch index d60541fb..e0e6c301 100644 --- a/recipe/patches/0006-fix-abseil-setup.patch +++ b/recipe/patches/0006-fix-abseil-setup.patch @@ -1,4 +1,4 @@ -From 990eda453f1a79a9ccbd7d32077fa92ac8dd6855 Mon Sep 17 00:00:00 2001 +From 9a2caaa38543ff7f7c470b37e54a3c3b468c4a1e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 4 Sep 2022 14:34:52 +0200 Subject: [PATCH 6/9] fix abseil setup @@ -8,10 +8,10 @@ Subject: [PATCH 6/9] fix abseil setup 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index c0b391ea2c..e898b58f54 100644 +index 7ba0ca029e..7c933c2223 100644 --- a/setup.py +++ b/setup.py -@@ -379,15 +379,22 @@ if BUILD_WITH_SYSTEM_CARES: +@@ -363,15 +363,22 @@ if BUILD_WITH_SYSTEM_CARES: if BUILD_WITH_SYSTEM_RE2: EXTENSION_LIBRARIES += ("re2",) if BUILD_WITH_SYSTEM_ABSL: diff --git a/recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch b/recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch index 1d437538..f5766c28 100644 --- a/recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch +++ b/recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch @@ -1,4 +1,4 @@ -From a15b67f029b793e6ea54e1aafe19c4ac54124e8c Mon Sep 17 00:00:00 2001 +From a7e619e76b1c2aafb30d4c29fe7ce0670b396f31 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 23 Aug 2022 11:45:20 +0200 Subject: [PATCH 7/9] mark linkage of c-ares/re2/zlib as private @@ -7,14 +7,14 @@ See also: https://github.com/grpc/grpc/issues/30838 Co-Authored-By: Mark Harfouche --- - CMakeLists.txt | 102 +++++++++++++++++++++++++++---------------------- - 1 file changed, 56 insertions(+), 46 deletions(-) + CMakeLists.txt | 106 +++++++++++++++++++++++++++---------------------- + 1 file changed, 58 insertions(+), 48 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fcec080905..da1e3a1474 100644 +index c5123edadf..a63a81a755 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2585,32 +2585,37 @@ target_include_directories(grpc +@@ -2617,33 +2617,38 @@ target_include_directories(grpc ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc @@ -24,6 +24,7 @@ index fcec080905..da1e3a1474 100644 - ${_gRPC_RE2_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} - absl::algorithm_container +- absl::config - absl::cleanup - absl::flat_hash_map - absl::flat_hash_set @@ -54,6 +55,7 @@ index fcec080905..da1e3a1474 100644 + # external dependencies that need to available at runtime + PUBLIC ${_gRPC_SSL_LIBRARIES} + PUBLIC absl::algorithm_container ++ PUBLIC absl::config + PUBLIC absl::cleanup + PUBLIC absl::flat_hash_map + PUBLIC absl::flat_hash_set @@ -76,7 +78,7 @@ index fcec080905..da1e3a1474 100644 endif() foreach(_hdr -@@ -3266,30 +3271,35 @@ target_include_directories(grpc_unsecure +@@ -3323,31 +3328,36 @@ target_include_directories(grpc_unsecure ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_unsecure @@ -85,6 +87,7 @@ index fcec080905..da1e3a1474 100644 - utf8_range_lib - ${_gRPC_ZLIB_LIBRARIES} - absl::algorithm_container +- absl::config - absl::cleanup - absl::flat_hash_map - absl::flat_hash_set @@ -112,6 +115,7 @@ index fcec080905..da1e3a1474 100644 + PRIVATE ${_gRPC_ZLIB_LIBRARIES} + # external dependencies that need to available at runtime + PUBLIC absl::algorithm_container ++ PUBLIC absl::config + PUBLIC absl::cleanup + PUBLIC absl::flat_hash_map + PUBLIC absl::flat_hash_set diff --git a/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch b/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch index f67fd6c8..bef97031 100644 --- a/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch +++ b/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch @@ -1,4 +1,4 @@ -From e5b5054cf2bb23e57a30d5f177fa18335420c65a Mon Sep 17 00:00:00 2001 +From 0353ed11e95e19a71280d83cf7c2033e6c312b35 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Jun 2023 20:11:22 +1100 Subject: [PATCH 8/9] link grpc++_unsecure to grpc++ @@ -9,10 +9,10 @@ which is where FileWatcherCertificateProvider etc. live 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index da1e3a1474..9d119cc4e1 100644 +index a63a81a755..6136bbaa10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -4746,6 +4746,7 @@ target_link_libraries(grpc++_unsecure +@@ -4868,6 +4868,7 @@ target_link_libraries(grpc++_unsecure ${_gRPC_ALLTARGETS_LIBRARIES} grpc_unsecure ${_gRPC_PROTOBUF_LIBRARIES} diff --git a/recipe/patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch b/recipe/patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch index d999476d..d7ba9cac 100644 --- a/recipe/patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch +++ b/recipe/patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch @@ -1,4 +1,4 @@ -From db5ae869e3012d9b7b6cf58b87ebaffa390932d0 Mon Sep 17 00:00:00 2001 +From 305518fc654de78eb4b8224bfb6142c056263ffb Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 6 Feb 2024 16:09:08 +0100 Subject: [PATCH 9/9] fix missing DLL-exports in vendored upb @@ -13,10 +13,10 @@ Subject: [PATCH 9/9] fix missing DLL-exports in vendored upb 6 files changed, 43 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9d119cc4e1..3cebf4ba4d 100644 +index 6136bbaa10..e4394061d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -3630,6 +3630,12 @@ if(WIN32 AND MSVC) +@@ -3689,6 +3689,12 @@ if(WIN32 AND MSVC) DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) endif() @@ -29,7 +29,7 @@ index 9d119cc4e1..3cebf4ba4d 100644 endif() target_include_directories(upb_mem_lib -@@ -3689,6 +3695,12 @@ if(WIN32 AND MSVC) +@@ -3748,6 +3754,12 @@ if(WIN32 AND MSVC) DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) endif() From 4512756a46c79ebbf0d42fce5000a6ed7a9372ca Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 29 Feb 2024 11:19:06 +1100 Subject: [PATCH 3/7] remove CMAKE_POLICY_DEFAULT_CMP0074, now that minimum version is high enough --- recipe/build-cpp.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/build-cpp.sh b/recipe/build-cpp.sh index 4a39168d..453b1a2a 100755 --- a/recipe/build-cpp.sh +++ b/recipe/build-cpp.sh @@ -29,7 +29,6 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == 1 ]]; then -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH=$BUILD_PREFIX \ -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX \ - -DCMAKE_POLICY_DEFAULT_CMP0074=NEW \ -DgRPC_CARES_PROVIDER="package" \ -DgRPC_PROTOBUF_PROVIDER="package" \ -DgRPC_SSL_PROVIDER="package" \ @@ -77,7 +76,6 @@ cmake -GNinja \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_PREFIX_PATH=$PREFIX \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ - -DCMAKE_POLICY_DEFAULT_CMP0074=NEW \ -DgRPC_CARES_PROVIDER="package" \ -DgRPC_PROTOBUF_PROVIDER="package" \ -DgRPC_SSL_PROVIDER="package" \ From cdb47907d8f8cf9329f09a68735c68c8596478a3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 29 Feb 2024 13:19:26 +1100 Subject: [PATCH 4/7] stop trying to link libprotobuf-lite --- recipe/patches/0003-Link-against-grpc.patch | 6 +++--- recipe/patches/0004-force-protoc-executable.patch | 2 +- recipe/patches/0005-switch-to-C-17-for-grpcio.patch | 4 ++-- recipe/patches/0006-fix-abseil-setup.patch | 6 +++--- .../0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch | 2 +- recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch | 2 +- .../0009-fix-missing-DLL-exports-in-vendored-upb.patch | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/recipe/patches/0003-Link-against-grpc.patch b/recipe/patches/0003-Link-against-grpc.patch index 4c8c6b0c..4152450d 100644 --- a/recipe/patches/0003-Link-against-grpc.patch +++ b/recipe/patches/0003-Link-against-grpc.patch @@ -1,4 +1,4 @@ -From 489094faf898b1add9c636131ae66e82c6751ef4 Mon Sep 17 00:00:00 2001 +From 5957c91f83b93c550266761cedfbcd747bf9dc18 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Mon, 13 Jun 2022 17:13:07 -0400 Subject: [PATCH 3/9] Link against grpc @@ -9,7 +9,7 @@ Co-Authored-By: H. Vetinari 1 file changed, 11 insertions(+) diff --git a/setup.py b/setup.py -index dfe4c9caa7..0b719cc86d 100644 +index dfe4c9caa7..d410af9006 100644 --- a/setup.py +++ b/setup.py @@ -179,6 +179,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value( @@ -28,7 +28,7 @@ index dfe4c9caa7..0b719cc86d 100644 +if BUILD_WITH_SYSTEM_GRPC_CORE: + EXTENSION_LIBRARIES += ('gpr', 'grpc', ) + if "win32" in sys.platform: -+ EXTENSION_LIBRARIES += ('libprotoc', 'libprotobuf', 'libprotobuf-lite', 'address_sorting',) ++ EXTENSION_LIBRARIES += ('libprotoc', 'libprotobuf', 'address_sorting',) + EXTENSION_LIBRARIES += tuple(f'upb_{x}_lib' for x in ["base", "json", "mem", "message", "textformat"]) + EXTENSION_LIBRARIES += tuple(lib.stem for lib in pathlib.Path(os.environ['LIBRARY_LIB']).glob('absl_*.lib')) diff --git a/recipe/patches/0004-force-protoc-executable.patch b/recipe/patches/0004-force-protoc-executable.patch index 17e1ecd1..47b88fc2 100644 --- a/recipe/patches/0004-force-protoc-executable.patch +++ b/recipe/patches/0004-force-protoc-executable.patch @@ -1,4 +1,4 @@ -From b3ebb02d157e1a812229a95c99b5878641e9e4a5 Mon Sep 17 00:00:00 2001 +From 63db0bf5d058836da172ff9c3c7fc113e1bfd52c Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 11 Sep 2020 14:20:04 +0200 Subject: [PATCH 4/9] force protoc executable diff --git a/recipe/patches/0005-switch-to-C-17-for-grpcio.patch b/recipe/patches/0005-switch-to-C-17-for-grpcio.patch index b92dc917..430660a2 100644 --- a/recipe/patches/0005-switch-to-C-17-for-grpcio.patch +++ b/recipe/patches/0005-switch-to-C-17-for-grpcio.patch @@ -1,4 +1,4 @@ -From 2a14ece3b421e6e0578252a29ed6a2792c870831 Mon Sep 17 00:00:00 2001 +From 80df2ca96a075552360b17ad4bc007be26f89d50 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 3 Sep 2022 19:23:15 +0200 Subject: [PATCH 5/9] switch to C++17 for grpcio @@ -8,7 +8,7 @@ Subject: [PATCH 5/9] switch to C++17 for grpcio 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py -index 0b719cc86d..7ba0ca029e 100644 +index d410af9006..62084b7800 100644 --- a/setup.py +++ b/setup.py @@ -220,7 +220,7 @@ def check_linker_need_libatomic(): diff --git a/recipe/patches/0006-fix-abseil-setup.patch b/recipe/patches/0006-fix-abseil-setup.patch index e0e6c301..4da8e5f1 100644 --- a/recipe/patches/0006-fix-abseil-setup.patch +++ b/recipe/patches/0006-fix-abseil-setup.patch @@ -1,4 +1,4 @@ -From 9a2caaa38543ff7f7c470b37e54a3c3b468c4a1e Mon Sep 17 00:00:00 2001 +From 3cd2e79d2963d5b351a3c2e1a0291eac59db9e87 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 4 Sep 2022 14:34:52 +0200 Subject: [PATCH 6/9] fix abseil setup @@ -8,7 +8,7 @@ Subject: [PATCH 6/9] fix abseil setup 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index 7ba0ca029e..7c933c2223 100644 +index 62084b7800..aa70b88cf9 100644 --- a/setup.py +++ b/setup.py @@ -363,15 +363,22 @@ if BUILD_WITH_SYSTEM_CARES: @@ -32,7 +32,7 @@ index 7ba0ca029e..7c933c2223 100644 if BUILD_WITH_SYSTEM_GRPC_CORE: EXTENSION_LIBRARIES += ('gpr', 'grpc', ) if "win32" in sys.platform: - EXTENSION_LIBRARIES += ('libprotoc', 'libprotobuf', 'libprotobuf-lite', 'address_sorting',) + EXTENSION_LIBRARIES += ('libprotoc', 'libprotobuf', 'address_sorting',) EXTENSION_LIBRARIES += tuple(f'upb_{x}_lib' for x in ["base", "json", "mem", "message", "textformat"]) - EXTENSION_LIBRARIES += tuple(lib.stem for lib in pathlib.Path(os.environ['LIBRARY_LIB']).glob('absl_*.lib')) diff --git a/recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch b/recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch index f5766c28..ba7db3e8 100644 --- a/recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch +++ b/recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch @@ -1,4 +1,4 @@ -From a7e619e76b1c2aafb30d4c29fe7ce0670b396f31 Mon Sep 17 00:00:00 2001 +From c627a532deba9fa62c6406473807339eeb12b3df Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 23 Aug 2022 11:45:20 +0200 Subject: [PATCH 7/9] mark linkage of c-ares/re2/zlib as private diff --git a/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch b/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch index bef97031..d35cdbe6 100644 --- a/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch +++ b/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch @@ -1,4 +1,4 @@ -From 0353ed11e95e19a71280d83cf7c2033e6c312b35 Mon Sep 17 00:00:00 2001 +From 6483539e6fd893c26d7b53986f5758844c74d5b3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Jun 2023 20:11:22 +1100 Subject: [PATCH 8/9] link grpc++_unsecure to grpc++ diff --git a/recipe/patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch b/recipe/patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch index d7ba9cac..60cece50 100644 --- a/recipe/patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch +++ b/recipe/patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch @@ -1,4 +1,4 @@ -From 305518fc654de78eb4b8224bfb6142c056263ffb Mon Sep 17 00:00:00 2001 +From f06e5ce0a8e548dc47248de2d84a48e6bb1f08c3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 6 Feb 2024 16:09:08 +0100 Subject: [PATCH 9/9] fix missing DLL-exports in vendored upb From cae5d81d2b610d219609fad5dd4042d170f347a6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 29 Feb 2024 20:36:36 +1100 Subject: [PATCH 5/7] fix symbol visibility issue on windows --- recipe/meta.yaml | 2 + .../patches/0001-windows-ssl-lib-names.patch | 2 +- recipe/patches/0002-fix-win-setup-cmds.patch | 2 +- recipe/patches/0003-Link-against-grpc.patch | 2 +- .../0004-force-protoc-executable.patch | 2 +- .../0005-switch-to-C-17-for-grpcio.patch | 2 +- recipe/patches/0006-fix-abseil-setup.patch | 2 +- ...inkage-of-c-ares-re2-zlib-as-private.patch | 2 +- .../0008-link-grpc-_unsecure-to-grpc.patch | 2 +- ...-missing-DLL-exports-in-vendored-upb.patch | 2 +- ...-set-_DLL_EXPORTS-when-building-and-.patch | 85 +++++++++++++++++++ 11 files changed, 96 insertions(+), 9 deletions(-) create mode 100644 recipe/patches/0010-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 952d19fc..8a1d9df4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,6 +34,8 @@ source: - patches/0008-link-grpc-_unsecure-to-grpc.patch # see https://github.com/grpc/grpc/issues/35794 - patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch + # fix symbol visibility regression on windows + - patches/0010-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch build: number: 0 diff --git a/recipe/patches/0001-windows-ssl-lib-names.patch b/recipe/patches/0001-windows-ssl-lib-names.patch index 98c16c83..2e379f52 100644 --- a/recipe/patches/0001-windows-ssl-lib-names.patch +++ b/recipe/patches/0001-windows-ssl-lib-names.patch @@ -1,7 +1,7 @@ From c6556038b1e913b84bd6427fa71457b2aa2f8577 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Mon, 17 Feb 2020 15:45:06 -0600 -Subject: [PATCH 1/9] windows ssl lib names +Subject: [PATCH 01/10] windows ssl lib names Co-Authored-By: Julien Schueller Co-Authored-By: Nicholas Bollweg diff --git a/recipe/patches/0002-fix-win-setup-cmds.patch b/recipe/patches/0002-fix-win-setup-cmds.patch index 5afd6dbd..95210465 100644 --- a/recipe/patches/0002-fix-win-setup-cmds.patch +++ b/recipe/patches/0002-fix-win-setup-cmds.patch @@ -1,7 +1,7 @@ From ef1656b4c28aea56b64ddcbebc4d9b08f591b8d7 Mon Sep 17 00:00:00 2001 From: Mike Sarahan Date: Tue, 18 Feb 2020 13:53:05 -0600 -Subject: [PATCH 2/9] fix win setup cmds +Subject: [PATCH 02/10] fix win setup cmds Co-Authored-By: Julien Schueller Co-Authored-By: Nicholas Bollweg diff --git a/recipe/patches/0003-Link-against-grpc.patch b/recipe/patches/0003-Link-against-grpc.patch index 4152450d..753a2f9d 100644 --- a/recipe/patches/0003-Link-against-grpc.patch +++ b/recipe/patches/0003-Link-against-grpc.patch @@ -1,7 +1,7 @@ From 5957c91f83b93c550266761cedfbcd747bf9dc18 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Mon, 13 Jun 2022 17:13:07 -0400 -Subject: [PATCH 3/9] Link against grpc +Subject: [PATCH 03/10] Link against grpc Co-Authored-By: H. Vetinari --- diff --git a/recipe/patches/0004-force-protoc-executable.patch b/recipe/patches/0004-force-protoc-executable.patch index 47b88fc2..0433a582 100644 --- a/recipe/patches/0004-force-protoc-executable.patch +++ b/recipe/patches/0004-force-protoc-executable.patch @@ -1,7 +1,7 @@ From 63db0bf5d058836da172ff9c3c7fc113e1bfd52c Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 11 Sep 2020 14:20:04 +0200 -Subject: [PATCH 4/9] force protoc executable +Subject: [PATCH 04/10] force protoc executable --- cmake/protobuf.cmake | 17 ++--------------- diff --git a/recipe/patches/0005-switch-to-C-17-for-grpcio.patch b/recipe/patches/0005-switch-to-C-17-for-grpcio.patch index 430660a2..a995253b 100644 --- a/recipe/patches/0005-switch-to-C-17-for-grpcio.patch +++ b/recipe/patches/0005-switch-to-C-17-for-grpcio.patch @@ -1,7 +1,7 @@ From 80df2ca96a075552360b17ad4bc007be26f89d50 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 3 Sep 2022 19:23:15 +0200 -Subject: [PATCH 5/9] switch to C++17 for grpcio +Subject: [PATCH 05/10] switch to C++17 for grpcio --- setup.py | 10 +++++----- diff --git a/recipe/patches/0006-fix-abseil-setup.patch b/recipe/patches/0006-fix-abseil-setup.patch index 4da8e5f1..9375f70a 100644 --- a/recipe/patches/0006-fix-abseil-setup.patch +++ b/recipe/patches/0006-fix-abseil-setup.patch @@ -1,7 +1,7 @@ From 3cd2e79d2963d5b351a3c2e1a0291eac59db9e87 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 4 Sep 2022 14:34:52 +0200 -Subject: [PATCH 6/9] fix abseil setup +Subject: [PATCH 06/10] fix abseil setup --- setup.py | 15 +++++++++++---- diff --git a/recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch b/recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch index ba7db3e8..dc4642ec 100644 --- a/recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch +++ b/recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch @@ -1,7 +1,7 @@ From c627a532deba9fa62c6406473807339eeb12b3df Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 23 Aug 2022 11:45:20 +0200 -Subject: [PATCH 7/9] mark linkage of c-ares/re2/zlib as private +Subject: [PATCH 07/10] mark linkage of c-ares/re2/zlib as private See also: https://github.com/grpc/grpc/issues/30838 diff --git a/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch b/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch index d35cdbe6..8faea1ca 100644 --- a/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch +++ b/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch @@ -1,7 +1,7 @@ From 6483539e6fd893c26d7b53986f5758844c74d5b3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Jun 2023 20:11:22 +1100 -Subject: [PATCH 8/9] link grpc++_unsecure to grpc++ +Subject: [PATCH 08/10] link grpc++_unsecure to grpc++ which is where FileWatcherCertificateProvider etc. live --- diff --git a/recipe/patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch b/recipe/patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch index 60cece50..8cc1104d 100644 --- a/recipe/patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch +++ b/recipe/patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch @@ -1,7 +1,7 @@ From f06e5ce0a8e548dc47248de2d84a48e6bb1f08c3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 6 Feb 2024 16:09:08 +0100 -Subject: [PATCH 9/9] fix missing DLL-exports in vendored upb +Subject: [PATCH 09/10] fix missing DLL-exports in vendored upb --- CMakeLists.txt | 12 +++++++++ diff --git a/recipe/patches/0010-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch b/recipe/patches/0010-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch new file mode 100644 index 00000000..29030d3f --- /dev/null +++ b/recipe/patches/0010-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch @@ -0,0 +1,85 @@ +From 2e9f78b486dff6f3184f85f91193a4e71725b053 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Thu, 29 Feb 2024 20:31:21 +1100 +Subject: [PATCH 10/10] for main targets, set *_DLL_EXPORTS when building and + *_DLL_IMPORTS in interface + +--- + CMakeLists.txt | 36 ++++++++++-------------------------- + 1 file changed, 10 insertions(+), 26 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e4394061d3..1f4a0a4b3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1670,10 +1670,8 @@ if(WIN32 AND MSVC) + COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" + ) + if(BUILD_SHARED_LIBS) +- target_compile_definitions(gpr +- PRIVATE +- "GPR_DLL_EXPORTS" +- ) ++ set_target_properties(gpr PROPERTIES DEFINE_SYMBOL "GPR_DLL_EXPORTS") ++ target_compile_definitions(gpr INTERFACE "GPR_DLL_IMPORTS") + endif() + if(gRPC_INSTALL) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gpr.pdb +@@ -2590,11 +2588,8 @@ if(WIN32 AND MSVC) + COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" + ) + if(BUILD_SHARED_LIBS) +- target_compile_definitions(grpc +- PRIVATE +- "GRPC_DLL_EXPORTS" +- "GPR_DLL_IMPORTS" +- ) ++ set_target_properties(grpc PROPERTIES DEFINE_SYMBOL "GRPC_DLL_EXPORTS") ++ target_compile_definitions(grpc INTERFACE "GRPC_DLL_IMPORTS") + endif() + if(gRPC_INSTALL) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc.pdb +@@ -3301,11 +3296,8 @@ if(WIN32 AND MSVC) + COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" + ) + if(BUILD_SHARED_LIBS) +- target_compile_definitions(grpc_unsecure +- PRIVATE +- "GRPC_DLL_EXPORTS" +- "GPR_DLL_IMPORTS" +- ) ++ set_target_properties(grpc_unsecure PROPERTIES DEFINE_SYMBOL "GRPC_DLL_EXPORTS") ++ target_compile_definitions(grpc_unsecure INTERFACE "GRPC_DLL_IMPORTS") + endif() + if(gRPC_INSTALL) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_unsecure.pdb +@@ -4102,12 +4094,8 @@ if(WIN32 AND MSVC) + COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" + ) + if(BUILD_SHARED_LIBS) +- target_compile_definitions(grpc++ +- PRIVATE +- "GRPCXX_DLL_EXPORTS" +- "GPR_DLL_IMPORTS" +- "GRPC_DLL_IMPORTS" +- ) ++ set_target_properties(grpc++ PROPERTIES DEFINE_SYMBOL "GRPCXX_DLL_EXPORTS") ++ target_compile_definitions(grpc++ INTERFACE "GRPCXX_DLL_IMPORTS") + endif() + if(gRPC_INSTALL) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++.pdb +@@ -4848,12 +4836,8 @@ if(WIN32 AND MSVC) + COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" + ) + if(BUILD_SHARED_LIBS) +- target_compile_definitions(grpc++_unsecure +- PRIVATE +- "GRPCXX_DLL_EXPORTS" +- "GPR_DLL_IMPORTS" +- "GRPC_DLL_IMPORTS" +- ) ++ set_target_properties(grpc++_unsecure PROPERTIES DEFINE_SYMBOL "GRPCXX_DLL_EXPORTS") ++ target_compile_definitions(grpc++_unsecure INTERFACE "GRPCXX_DLL_IMPORTS") + endif() + if(gRPC_INSTALL) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++_unsecure.pdb From 7d1d5ff96a403814b5a86d2bbee631752592f056 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 6 Mar 2024 14:19:08 +1100 Subject: [PATCH 6/7] add migration for libprotobuf 4.25.3 --- .../libgrpc162_libprotobuf4253.yaml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .ci_support/migrations/libgrpc162_libprotobuf4253.yaml diff --git a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml new file mode 100644 index 00000000..1d4c28fb --- /dev/null +++ b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml @@ -0,0 +1,24 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libprotobuf 4.25.3 + kind: version + migration_number: 1 + paused: true + exclude: + - abseil-cpp + - grpc-cpp + - libprotobuf + - protobuf +libgrpc: +- "1.62" +libprotobuf: +- 4.25.3 +# keep abseil bump from libabseil20240116_libgrpc161_libprotobuf4252; +# this ensures that this migration applies also without the previous one +libabseil: +- "20240116" +# already covered by libabseil20230802_libgrpc157_libprotobuf4234, +# which we cannot delete yet, but keep for clarity +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +- "10.13" # [osx and x86_64] +migrator_ts: 1709522594.9193177 From 0987a1a072997229154147be7c95177f65910520 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 6 Mar 2024 14:22:47 +1100 Subject: [PATCH 7/7] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.06.02.49.17 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 9e5676e6..1b1cf992 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -19,7 +19,7 @@ docker_image: libabseil: - '20240116' libprotobuf: -- 4.25.2 +- 4.25.3 openssl: - '3' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index fdab0338..318a0c7a 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -23,7 +23,7 @@ docker_image: libabseil: - '20240116' libprotobuf: -- 4.25.2 +- 4.25.3 openssl: - '3' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index f6be5f6b..71ec9d41 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -19,7 +19,7 @@ docker_image: libabseil: - '20240116' libprotobuf: -- 4.25.2 +- 4.25.3 openssl: - '3' pin_run_as_build: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 0d59394a..705aebac 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -17,7 +17,7 @@ cxx_compiler_version: libabseil: - '20240116' libprotobuf: -- 4.25.2 +- 4.25.3 macos_machine: - x86_64-apple-darwin13.4.0 openssl: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 1d36a908..1b741256 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -17,7 +17,7 @@ cxx_compiler_version: libabseil: - '20240116' libprotobuf: -- 4.25.2 +- 4.25.3 macos_machine: - arm64-apple-darwin20.0.0 openssl: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 85a05f1d..604e9f27 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -11,7 +11,7 @@ cxx_compiler: libabseil: - '20240116' libprotobuf: -- 4.25.2 +- 4.25.3 openssl: - '3' pin_run_as_build: