diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index d4f257f1..f600bf4d 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -25,7 +25,7 @@ docker_image: libabseil: - '20240116' libprotobuf: -- 5.26.1 +- 5.27.2 openssl: - '3' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index b5340a68..4baf79ad 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -29,7 +29,7 @@ docker_image: libabseil: - '20240116' libprotobuf: -- 5.26.1 +- 5.27.2 openssl: - '3' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 7d797b3b..9ed32243 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -25,7 +25,7 @@ docker_image: libabseil: - '20240116' libprotobuf: -- 5.26.1 +- 5.27.2 openssl: - '3' pin_run_as_build: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index fd8197dd..edbd03f8 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -25,7 +25,7 @@ cxx_compiler_version: libabseil: - '20240116' libprotobuf: -- 5.26.1 +- 5.27.2 macos_machine: - x86_64-apple-darwin13.4.0 openssl: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 886c4ff1..a865502f 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -25,7 +25,7 @@ cxx_compiler_version: libabseil: - '20240116' libprotobuf: -- 5.26.1 +- 5.27.2 macos_machine: - arm64-apple-darwin20.0.0 openssl: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 95670119..875821b5 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler: libabseil: - '20240116' libprotobuf: -- 5.26.1 +- 5.27.2 openssl: - '3' pin_run_as_build: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5836e8d..ba4b251c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,7 +72,6 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" - ( startgroup "Inspecting artifacts" ) 2> /dev/null # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index a410c36a..087dd413 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,3 +1,6 @@ # if bootstrapping, don't build grpcio to break cycle; see meta.yaml bootstrap: - yes + +libprotobuf: + - 5.27.2 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index be578f0e..b9ff1f23 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.63.1" %} +{% set version = "1.64.2" %} # 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 @@ -23,7 +23,7 @@ package: source: url: https://github.com/grpc/grpc/archive/v{{ version.replace(".pre", "-pre") }}.tar.gz - sha256: 31198ecf6ec8a79b0c42a90441ddce858e5fae690c2e300d5d08a9f45d7136df + sha256: c682fc39baefc6e804d735e6b48141157b7213602cc66dbe0bf375b904d8b5f9 patches: - patches/0001-windows-ssl-lib-names.patch - patches/0002-fix-win-setup-cmds.patch diff --git a/recipe/patches/0001-windows-ssl-lib-names.patch b/recipe/patches/0001-windows-ssl-lib-names.patch index 41eb9032..86df9415 100644 --- a/recipe/patches/0001-windows-ssl-lib-names.patch +++ b/recipe/patches/0001-windows-ssl-lib-names.patch @@ -1,4 +1,4 @@ -From 6b866a33ad27c49a0c3bc8786403b7d28bbd36f6 Mon Sep 17 00:00:00 2001 +From 7d1feb1a2c6dd162342c2cd1698c82913e59fe1b Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Mon, 17 Feb 2020 15:45:06 -0600 Subject: [PATCH 01/11] windows ssl lib names diff --git a/recipe/patches/0002-fix-win-setup-cmds.patch b/recipe/patches/0002-fix-win-setup-cmds.patch index 6b4c868d..f64860a4 100644 --- a/recipe/patches/0002-fix-win-setup-cmds.patch +++ b/recipe/patches/0002-fix-win-setup-cmds.patch @@ -1,4 +1,4 @@ -From cf9afdccb2ac3e78526a21a66ae26571666652d8 Mon Sep 17 00:00:00 2001 +From 8c8513f944d4a2d2ab248f6453e35fe184fd8517 Mon Sep 17 00:00:00 2001 From: Mike Sarahan Date: Tue, 18 Feb 2020 13:53:05 -0600 Subject: [PATCH 02/11] fix win setup cmds diff --git a/recipe/patches/0003-Link-against-grpc.patch b/recipe/patches/0003-Link-against-grpc.patch index 1ade1fc1..036823d9 100644 --- a/recipe/patches/0003-Link-against-grpc.patch +++ b/recipe/patches/0003-Link-against-grpc.patch @@ -1,4 +1,4 @@ -From 2584b098efb33b76e285461cf55626b372461ca3 Mon Sep 17 00:00:00 2001 +From e37560eca9d1f60c293cab643544790132fdd04d Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Mon, 13 Jun 2022 17:13:07 -0400 Subject: [PATCH 03/11] Link against grpc diff --git a/recipe/patches/0004-force-protoc-executable.patch b/recipe/patches/0004-force-protoc-executable.patch index 16436e2e..6c3cd344 100644 --- a/recipe/patches/0004-force-protoc-executable.patch +++ b/recipe/patches/0004-force-protoc-executable.patch @@ -1,4 +1,4 @@ -From a01d7716b2bb53eb0c59862aa901bc3cd525305e Mon Sep 17 00:00:00 2001 +From 7a3cf0a45b4831772ad2a7bae2a2fdc359f52f03 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 11 Sep 2020 14:20:04 +0200 Subject: [PATCH 04/11] 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 0ff2d558..9c95f2a0 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 acac7c62f37125cdd9d740c1ee91a2aeaae3f3a5 Mon Sep 17 00:00:00 2001 +From 848db8f6240bca1104b8ab76116902fe019ef701 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 3 Sep 2022 19:23:15 +0200 Subject: [PATCH 05/11] switch to C++17 for grpcio diff --git a/recipe/patches/0006-fix-abseil-setup.patch b/recipe/patches/0006-fix-abseil-setup.patch index 59112416..f03ea874 100644 --- a/recipe/patches/0006-fix-abseil-setup.patch +++ b/recipe/patches/0006-fix-abseil-setup.patch @@ -1,4 +1,4 @@ -From 58941fdb8a870d8dcbe45688d9eae55db58dd1ac Mon Sep 17 00:00:00 2001 +From 367b2ce12fb79102b152cb66069ef7b55fc194f2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 4 Sep 2022 14:34:52 +0200 Subject: [PATCH 06/11] fix abseil setup 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 dff263aa..f33109a8 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 c3326313bbfb3a9c4c7519bfa461c80b85680f49 Mon Sep 17 00:00:00 2001 +From 8756017c354a44d9e192c14e46f3b344120d2376 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 23 Aug 2022 11:45:20 +0200 Subject: [PATCH 07/11] mark linkage of c-ares/re2/zlib as private @@ -11,10 +11,10 @@ Co-Authored-By: Mark Harfouche 1 file changed, 60 insertions(+), 50 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index f95d1e9b9b..788b929ae5 100644 +index 0627429f49..b17aa72cb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2659,34 +2659,39 @@ target_include_directories(grpc +@@ -2663,34 +2663,39 @@ target_include_directories(grpc ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc @@ -80,7 +80,7 @@ index f95d1e9b9b..788b929ae5 100644 endif() foreach(_hdr -@@ -3362,32 +3367,37 @@ target_include_directories(grpc_unsecure +@@ -3365,32 +3370,37 @@ target_include_directories(grpc_unsecure ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_unsecure diff --git a/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch b/recipe/patches/0008-link-grpc-_unsecure-to-grpc.patch index e5d4058c..10ffc872 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 8822526226cffcbffdb93b4e1bd2928d55558bd0 Mon Sep 17 00:00:00 2001 +From 1eca4ff781c33b565389981f366ab3e735a4982d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Jun 2023 20:11:22 +1100 Subject: [PATCH 08/11] 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 788b929ae5..840a7d971e 100644 +index b17aa72cb9..8e65d84e30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -4896,6 +4896,7 @@ target_link_libraries(grpc++_unsecure +@@ -4900,6 +4900,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 36b7b932..e5e3d80c 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,22 +1,20 @@ -From 1086f8d78b86b4e072b8b64837fcda3d3e2872c9 Mon Sep 17 00:00:00 2001 +From 7c202982435c952029a678c857f830d2794fdf91 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 6 Feb 2024 16:09:08 +0100 Subject: [PATCH 09/11] fix missing DLL-exports in vendored upb --- CMakeLists.txt | 12 +++++++ - third_party/upb/upb/mem/alloc.c | 2 +- third_party/upb/upb/mem/alloc.h | 2 +- - .../upb/upb/mini_table/internal/message.c | 2 +- .../upb/upb/mini_table/internal/message.h | 3 +- third_party/upb/upb/port/def.inc | 35 +++++++++++++++++++ - 6 files changed, 52 insertions(+), 4 deletions(-) + 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 840a7d971e..b70ca98e28 100644 +index 8e65d84e30..3d40eae992 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -3725,6 +3725,12 @@ if(WIN32 AND MSVC) +@@ -3729,6 +3729,12 @@ if(WIN32 AND MSVC) DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) endif() @@ -29,7 +27,7 @@ index 840a7d971e..b70ca98e28 100644 endif() target_include_directories(upb_mem_lib -@@ -3787,6 +3793,12 @@ if(WIN32 AND MSVC) +@@ -3791,6 +3797,12 @@ if(WIN32 AND MSVC) DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) endif() @@ -42,16 +40,6 @@ index 840a7d971e..b70ca98e28 100644 endif() target_include_directories(upb_message_lib -diff --git a/third_party/upb/upb/mem/alloc.c b/third_party/upb/upb/mem/alloc.c -index d103f98f30..6800e06a17 100644 ---- a/third_party/upb/upb/mem/alloc.c -+++ b/third_party/upb/upb/mem/alloc.c -@@ -24,4 +24,4 @@ static void* upb_global_allocfunc(upb_alloc* alloc, void* ptr, size_t oldsize, - } - } - --upb_alloc upb_alloc_global = {&upb_global_allocfunc}; -+UPB_MEM_DLL upb_alloc upb_alloc_global = {&upb_global_allocfunc}; diff --git a/third_party/upb/upb/mem/alloc.h b/third_party/upb/upb/mem/alloc.h index 441731d2d8..db048ceeff 100644 --- a/third_party/upb/upb/mem/alloc.h @@ -65,19 +53,6 @@ index 441731d2d8..db048ceeff 100644 /* Functions that hard-code the global malloc. * -diff --git a/third_party/upb/upb/mini_table/internal/message.c b/third_party/upb/upb/mini_table/internal/message.c -index f278b36577..d27b06b6bb 100644 ---- a/third_party/upb/upb/mini_table/internal/message.c -+++ b/third_party/upb/upb/mini_table/internal/message.c -@@ -15,7 +15,7 @@ - #include "upb/port/def.inc" - - // A MiniTable for an empty message, used for unlinked sub-messages. --const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_Empty) = { -+UPB_MSG_DLL const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_Empty) = { - .UPB_PRIVATE(subs) = NULL, - .UPB_PRIVATE(fields) = NULL, - .UPB_PRIVATE(size) = sizeof(struct upb_Message), diff --git a/third_party/upb/upb/mini_table/internal/message.h b/third_party/upb/upb/mini_table/internal/message.h index 95244233c9..edefc76595 100644 --- a/third_party/upb/upb/mini_table/internal/message.h 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 index 9ad344cf..c8582d56 100644 --- 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 @@ -1,4 +1,4 @@ -From 036d3f2eded9abfc2af56f0ef93fdf1cc2630fde Mon Sep 17 00:00:00 2001 +From e0dec85e24135192813de8942d69b33f3b78ea13 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 29 Feb 2024 20:31:21 +1100 Subject: [PATCH 10/11] for main targets, set *_DLL_EXPORTS when building and @@ -9,10 +9,10 @@ Subject: [PATCH 10/11] for main targets, set *_DLL_EXPORTS when building and 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index b70ca98e28..d35646c345 100644 +index 3d40eae992..16d2c5c707 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1711,10 +1711,8 @@ if(WIN32 AND MSVC) +@@ -1715,10 +1715,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) @@ -25,7 +25,7 @@ index b70ca98e28..d35646c345 100644 endif() if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gpr.pdb -@@ -2632,11 +2630,8 @@ if(WIN32 AND MSVC) +@@ -2636,11 +2634,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) @@ -39,7 +39,7 @@ index b70ca98e28..d35646c345 100644 endif() if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc.pdb -@@ -3340,11 +3335,8 @@ if(WIN32 AND MSVC) +@@ -3343,11 +3338,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) @@ -53,7 +53,7 @@ index b70ca98e28..d35646c345 100644 endif() if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_unsecure.pdb -@@ -4135,12 +4127,8 @@ if(WIN32 AND MSVC) +@@ -4139,12 +4131,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) @@ -68,7 +68,7 @@ index b70ca98e28..d35646c345 100644 endif() if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++.pdb -@@ -4876,12 +4864,8 @@ if(WIN32 AND MSVC) +@@ -4880,12 +4868,8 @@ if(WIN32 AND MSVC) COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(BUILD_SHARED_LIBS) diff --git a/recipe/patches/0011-set-Wl-undefined-dynamic_lookup-for-upb_-json-textfo.patch b/recipe/patches/0011-set-Wl-undefined-dynamic_lookup-for-upb_-json-textfo.patch index 2835a7e5..f377e8d9 100644 --- a/recipe/patches/0011-set-Wl-undefined-dynamic_lookup-for-upb_-json-textfo.patch +++ b/recipe/patches/0011-set-Wl-undefined-dynamic_lookup-for-upb_-json-textfo.patch @@ -1,4 +1,4 @@ -From 3a051669b869fadb09dcafaa3197a15b65cb6d7f Mon Sep 17 00:00:00 2001 +From 8143ced84bdc82ff2c39964ca3226958a40103f8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 16 Jul 2024 17:40:18 +1100 Subject: [PATCH 11/11] set `-Wl,-undefined,dynamic_lookup` for @@ -9,10 +9,10 @@ Subject: [PATCH 11/11] set `-Wl,-undefined,dynamic_lookup` for 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d35646c345..57a8d326d8 100644 +index 16d2c5c707..b36678e8d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -3663,6 +3663,9 @@ if(WIN32 AND MSVC) +@@ -3667,6 +3667,9 @@ if(WIN32 AND MSVC) DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) endif() @@ -22,7 +22,7 @@ index d35646c345..57a8d326d8 100644 endif() target_include_directories(upb_json_lib -@@ -3876,6 +3879,9 @@ if(WIN32 AND MSVC) +@@ -3880,6 +3883,9 @@ if(WIN32 AND MSVC) DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) endif()