commit: 378c696ceed28eb842f59b4364403b17156dc976 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Sun Apr 6 18:37:57 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Apr 11 09:47:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378c696c
net-libs/grpc: add 1.71.0 Should fix #935787 Bug: https://bugs.gentoo.org/935787 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> net-libs/grpc/Manifest | 5 + .../files/grpc-1.71.0-fix-already-registered.patch | 34 +++ net-libs/grpc/files/grpc-1.71.0-system-gtest.patch | 93 +++++++ net-libs/grpc/grpc-1.71.0.ebuild | 276 +++++++++++++++++++++ 4 files changed, 408 insertions(+) diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index 03554fdb6e8f..c54e5c83aee9 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -1,3 +1,5 @@ +DIST envoi-api-4de3c74cf21a9958c1cf26d8993c55c6e0d28b49.tar.gz 697162 BLAKE2B efc9d2471ce883daab2c2fcdd9266ede4e46b241fd11e5ea36094487e249647840245da75da7f09766eafb681d107b40043cf5e29461860d8dcbcf1ce7fa5ed9 SHA512 8ce3de7dc95b2fe11de7f8e61d83ac97f62f69e02410da87564a6657ba009fd9f3ff1890888f5876fc1bde056505823ed73d9c5a6746aac79781af8c508f5275 +DIST googleapis-fe8ba054ad4f7eca946c2d14a63c3f07c0b586a0.tar.gz 9166557 BLAKE2B 83f2c9ae73075bb2d7860632e058a968153d3b74625cc044cfa0768ffc7bf84ae1dca115976fa1fe02d46b870996e5e64524f59cb62401434ee4d482642766b6 SHA512 d77ea83f8e68e3c0b667e7de43c2cd28b0ca7b969b2cf127b3873fc19f330ad85afb314bef4174a4e11ed68b620e43853d8b44eb833c5eca7e820ca21c1c3e15 DIST grpc-1.52.1.tar.gz 8686340 BLAKE2B 0076ddd4a2840892f4ad11885e18f782b6a645337224974522c5f828d0226d6a1e19aaaf0f30ea3225d56118e0cfc251d45b8d5e6811c2d1a84e274ff037bb53 SHA512 06c69fb817af75b2610761a3a193178b749755eb7bed58875aa251def7c0c253cdaf02cf834c31c8b2cae7b01a6081e2aece4b131a162f64bd45ff0aff4d7758 DIST grpc-1.55.1.tar.gz 9272441 BLAKE2B b2788d8deeb9791f04073294caa82c10e2cfe6376d09f396b51508a52f809e7f9f48d50ad5a62b2add652633b5c2d3b1ba07857b81111fa810202106251f440d SHA512 ecfa3a5affe33f160032f2ce42a9b44344d217359f68ee99305162ccabc911f44bc22512401183de74347e86add2ce20ec89da87ba6c14ab69874eb0835145d1 DIST grpc-1.56.1.tar.gz 11750628 BLAKE2B 52ea088d3d19fa7c1d1dc44899cd67bfd0132df2fd37690d855194d3196e4c26cfdd6fe589b5e4f802cdf88e70aad6c33b3ee98c1bd1bc47356d0dee9cdc706d SHA512 2bf9619edb60a6cec4cdaa89ee3c470c52b9745ea954bfe205aef6eb29bb55949de02e8c2afc7352eacdcd33fe4000861fd16fda9e5f66c87222674b17d6322a @@ -6,3 +8,6 @@ DIST grpc-1.60.0.tar.gz 17442762 BLAKE2B 35cc0ea938deb848ca91e3d5f8879b85b80f94a DIST grpc-1.62.1.tar.gz 22384671 BLAKE2B 134e40732e784e52d518cde6e518e4c08e2f67a025754d88b92a9a314f86e53bee33ee793395b9e225c0895c6ac8b9c036892c82c19d0fddf69909a22eac4b78 SHA512 3224ad2617c18156f90c54c1ebf1f2015e405a6f12546e8709e0c905f52508c9f1a13b4d5a6cc7a35abf58b429985b5b504c9062f50c0d3d6aa163180a61047a DIST grpc-1.65.1.tar.gz 22539865 BLAKE2B f044305a1817c46d12b96d65a7d70e4342921d372bbeb127840ccbf5cda1f5a34daf7319cd8564a7d327f6abfbac67e4300f80cfe9e66dd49d65d77d30fd3402 SHA512 ca8ebe71fb88a0fc605706c3c81c349e79c40b347081a06795fa64550720bc745373ac5d167263d098e98553077cfda141e4f4be2eefa5f345ede9b0ddec4f54 DIST grpc-1.66.0.tar.gz 22654517 BLAKE2B 99c7392036dd2eda8384c921223c7d877739c9368a90ec6ba513f7b37b5f5d151795362f3260cb2b3a4132a11b9cb2b3ce6bb5b6894186efc8fa1d8e809c8ebc SHA512 1cd2662ff71ef45642d7c7ac3ab9b20d850ff4f925aea335f0069d870d54f6e4c3107d858cf2e6a45e3e511bc5c9983e75173a0ee7aab7a8e34357c6d5e2fbe8 +DIST grpc-1.71.0.gh.tar.gz 14659092 BLAKE2B 8c08020eca27c97d5a47e61a758e482662425c8afe6feef8f3ba9cd0fe2d2c100c9087b16fbf3f2ba3d447aee5d7da3267db7c6e642e2a94f554640364135990 SHA512 25783f75295919d0a077e3d0ff70ea2e651eaf107da2ebe8af40a584540f2f56aae0e04c7b809f3b1eb7d5adc3892f84464662d80b1234a111836f454ba84a18 +DIST protoc-gen-validate-32c2415389a3538082507ae537e7edd9578c64ed.tar.gz 183819 BLAKE2B fc7694c2a11a1d47a7e9c1038fd0792d5cfbe9976a43c9f7843a4c5eee36e5bdb4945e9e1fc23f9dde3af00c74dacec9d77f1078d47581b0e1732d4c097b0f81 SHA512 be87721eb350b9ee4a0cd03fcd15a9a89dd17b46929f53614b4696133b4b8417d35e36012da6d59991b70d3c349a8d43ee402e00968943f3dd006deb9a973fdc +DIST xds-3a472e524827f72d1ad621c4983dd5af54c46776.tar.gz 104469 BLAKE2B 656f360de57d53a094775bb197f28cf74670973f718c54ad62bc45c8c917a392c7f69c04cbf9291999b372fc21c6c321930ccd51c99b867ede9d1811ea23fdf5 SHA512 9e2d205bb8924294b29c42c454c5c65361d05abf511636f9c9a6ff5335d7f6408edef9f7576a5c81ccdaefe79dc08971950211bd4eb188b1e2142a60f9eae509 diff --git a/net-libs/grpc/files/grpc-1.71.0-fix-already-registered.patch b/net-libs/grpc/files/grpc-1.71.0-fix-already-registered.patch new file mode 100644 index 000000000000..22fc7535c08d --- /dev/null +++ b/net-libs/grpc/files/grpc-1.71.0-fix-already-registered.patch @@ -0,0 +1,34 @@ +From 01db6085d40a2d4576b83d68e634dfd4f5319fbc Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril...@gmail.com> +Date: Sun, 6 Apr 2025 16:00:16 +0200 +Subject: [PATCH] fix already registered + +Bug: https://bugs.gentoo.org/935787 +Signed-off-by: Paul Zander <negril...@gmail.com> + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f5da29a..d375591 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17673,9 +17673,8 @@ target_link_libraries(filter_test_test + absl::any + absl::optional + absl::variant +- grpc_unsecure + ${_gRPC_PROTOBUF_LIBRARIES} +- grpc_test_util ++ grpc_test_util_unsecure + ) + + +@@ -40852,7 +40851,6 @@ target_link_libraries(thread_pool_test + absl::any + absl::optional + absl::variant +- grpc + grpc_test_util_unsecure + ) + +-- +2.49.0 + diff --git a/net-libs/grpc/files/grpc-1.71.0-system-gtest.patch b/net-libs/grpc/files/grpc-1.71.0-system-gtest.patch new file mode 100644 index 000000000000..42025d7acd4f --- /dev/null +++ b/net-libs/grpc/files/grpc-1.71.0-system-gtest.patch @@ -0,0 +1,93 @@ +From 719360fcdc5edc9b59d4dbce28d910ad61eca0d0 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril...@gmail.com> +Date: Sat, 5 Apr 2025 19:52:50 +0200 +Subject: [PATCH] system gtest + +Signed-off-by: Paul Zander <negril...@gmail.com> + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 19863dd..4f9cefc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3819,77 +3819,8 @@ if(gRPC_INSTALL) + endif() + + if(gRPC_BUILD_TESTS) +- +-add_library(gtest +- third_party/googletest/googlemock/src/gmock-cardinalities.cc +- third_party/googletest/googlemock/src/gmock-internal-utils.cc +- third_party/googletest/googlemock/src/gmock-matchers.cc +- third_party/googletest/googlemock/src/gmock-spec-builders.cc +- third_party/googletest/googlemock/src/gmock.cc +- third_party/googletest/googletest/src/gtest-assertion-result.cc +- third_party/googletest/googletest/src/gtest-death-test.cc +- third_party/googletest/googletest/src/gtest-filepath.cc +- third_party/googletest/googletest/src/gtest-matchers.cc +- third_party/googletest/googletest/src/gtest-port.cc +- third_party/googletest/googletest/src/gtest-printers.cc +- third_party/googletest/googletest/src/gtest-test-part.cc +- third_party/googletest/googletest/src/gtest-typed-test.cc +- third_party/googletest/googletest/src/gtest.cc +-) +- +-target_compile_features(gtest PUBLIC cxx_std_17) +- +-set_target_properties(gtest PROPERTIES +- VERSION ${gRPC_CORE_VERSION} +- SOVERSION ${gRPC_CORE_SOVERSION} +-) +- +-if(WIN32 AND MSVC) +- set_target_properties(gtest PROPERTIES COMPILE_PDB_NAME "gtest" +- COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" +- ) +- if(gRPC_INSTALL) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gtest.pdb +- DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL +- ) +- endif() +-endif() +- +-target_include_directories(gtest +- PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> +- PRIVATE +- ${CMAKE_CURRENT_SOURCE_DIR} +- ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} +- ${_gRPC_RE2_INCLUDE_DIR} +- ${_gRPC_SSL_INCLUDE_DIR} +- ${_gRPC_UPB_GENERATED_DIR} +- ${_gRPC_UPB_GRPC_GENERATED_DIR} +- ${_gRPC_UPB_INCLUDE_DIR} +- ${_gRPC_XXHASH_INCLUDE_DIR} +- ${_gRPC_ZLIB_INCLUDE_DIR} +- third_party/googletest/googletest/include +- third_party/googletest/googletest +- third_party/googletest/googlemock/include +- third_party/googletest/googlemock +-) +-target_link_libraries(gtest +- ${_gRPC_ALLTARGETS_LIBRARIES} +- ${_gRPC_RE2_LIBRARIES} +- absl::flat_hash_set +- absl::failure_signal_handler +- absl::stacktrace +- absl::symbolize +- absl::flags +- absl::flags_parse +- absl::flags_reflection +- absl::flags_usage +- absl::strings +- absl::any +- absl::optional +- absl::variant +-) +- +- ++ find_package(GTest REQUIRED) ++ enable_testing() + endif() + + add_library(upb_base_lib +-- +2.49.0 diff --git a/net-libs/grpc/grpc-1.71.0.ebuild b/net-libs/grpc/grpc-1.71.0.ebuild new file mode 100644 index 000000000000..c745ed62f6b1 --- /dev/null +++ b/net-libs/grpc/grpc-1.71.0.ebuild @@ -0,0 +1,276 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_IN_SOURCE_BUILD=1 +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake flag-o-matic python-any-r1 + +MY_PV="${PV//_pre/-pre}" + +DESCRIPTION="Modern open source high performance RPC framework" +HOMEPAGE="https://grpc.io"; + +ENVOY_API_COMMIT="4de3c74cf21a9958c1cf26d8993c55c6e0d28b49" +GOOGLEAPIS_COMMIT="fe8ba054ad4f7eca946c2d14a63c3f07c0b586a0" +XDS_COMMIT="3a472e524827f72d1ad621c4983dd5af54c46776" +PROTOC_GEN_VALIDATE_COMMIT="32c2415389a3538082507ae537e7edd9578c64ed" + +SRC_URI=" + https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz + test? ( + https://github.com/envoyproxy/data-plane-api/archive/${ENVOY_API_COMMIT}.tar.gz + -> envoi-api-${ENVOY_API_COMMIT}.tar.gz + https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz + -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz + https://github.com/cncf/xds/archive/${XDS_COMMIT}.tar.gz + -> xds-${XDS_COMMIT}.tar.gz + https://github.com/bufbuild/protoc-gen-validate/archive/${PROTOC_GEN_VALIDATE_COMMIT}.tar.gz + -> protoc-gen-validate-${PROTOC_GEN_VALIDATE_COMMIT}.tar.gz + ) +" + +S="${WORKDIR}/${PN}-${MY_PV}" +LICENSE="Apache-2.0" +# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt +SLOT="0/46.$(ver_rs 1-2 '' "$(ver_cut 1-2)")" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="doc examples test systemd" +RESTRICT="!test? ( test )" + +# look for submodule versions in third_party dir +RDEPEND=" + >=dev-cpp/abseil-cpp-20240116:= + >=dev-libs/re2-0.2022.04.01:= + >=dev-libs/openssl-1.1.1:0=[-bindist(-)] + >=dev-libs/protobuf-27.0:= + dev-libs/xxhash + >=net-dns/c-ares-1.19.1:= + sys-libs/zlib:= + systemd? ( sys-apps/systemd:= ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-cpp/benchmark + dev-cpp/gflags + dev-cpp/gtest + ) +" +BDEPEND=" + ${RDEPEND} + virtual/pkgconfig + test? ( + net-misc/curl + $(python_gen_any_dep ' + dev-python/twisted[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/cffi[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.71.0-fix-already-registered.patch" + "${FILESDIR}/${PN}-1.71.0-system-gtest.patch" +) + +python_check_deps() { + if use test; then + python_has_version -b "dev-python/twisted[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/cffi[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/six[${PYTHON_USEDEP}]" + fi +} + +soversion_check() { + local core_sover cpp_sover + # extract quoted number. line we check looks like this: 'set(gRPC_CPP_SOVERSION "1.37")' + core_sover="$(grep 'set(gRPC_CORE_SOVERSION ' CMakeLists.txt | sed '/.*\"\(.*\)\".*/ s//\1/')" + cpp_sover="$(grep 'set(gRPC_CPP_SOVERSION ' CMakeLists.txt | sed '/.*\"\(.*\)\".*/ s//\1/')" + # remove dots, e.g. 1.37 -> 137 + core_sover="${core_sover//./}" + cpp_sover="${cpp_sover//./}" + [[ ${core_sover} -eq $(ver_cut 2 "${SLOT}") ]] || die "fix core sublot! should be ${core_sover}" + [[ ${cpp_sover} -eq $(ver_cut 3 "${SLOT}") ]] || die "fix cpp sublot! should be ${cpp_sover}" +} + +src_prepare() { + soversion_check + + if use test; then + rmdir third_party/envoy-api || die + ln -frs "${WORKDIR}/data-plane-api-${ENVOY_API_COMMIT}" third_party/envoy-api || die + rmdir third_party/googleapis || die + ln -frs "${WORKDIR}/googleapis-${GOOGLEAPIS_COMMIT}" third_party/googleapis || die + rmdir third_party/xds || die + ln -frs "${WORKDIR}/xds-${XDS_COMMIT}" third_party/xds || die + rmdir third_party/protoc-gen-validate || die + ln -frs "${WORKDIR}/protoc-gen-validate-${PROTOC_GEN_VALIDATE_COMMIT}" third_party/protoc-gen-validate || die + + sed "/gmock_main.cc/d" -i CMakeLists.txt || die + + # These extra libs are defined as dependencies of the vendored gtest, + # which is a dependency of the unit tests, therefore they are normally + # implicitly picked up and linked to the test binaries. However removing + # the vendored gtest to use the system one also removes these dependencies, + # so we have to redeclare them as dependencies of the test binaries individually. + local extra_libs=( + "GTest::gtest" + "GTest::gmock_main" + "\${_gRPC_RE2_LIBRARIES}" + "absl::flat_hash_set" + "absl::failure_signal_handler" + "absl::stacktrace" + "absl::symbolize" + "absl::flags" + "absl::flags_parse" + "absl::flags_reflection" + "absl::flags_usage" + "absl::strings" + "absl::any" + "absl::optional" + "absl::variant" + ) + : "$(echo "${extra_libs[@]}" | "${EPYTHON}" -c 'import sys;print("\\n\\1".join(sys.stdin.read().split()))')" + local rstring="${_}" + sed -i -E "s/( +)gtest/\1${rstring}/g" "CMakeLists.txt" || die + + # Integrate tests with ctest rather than the custom test framework. + # Formatted with dev-python/black. + "${EPYTHON}" - >> "${S}/CMakeLists.txt" <<-EOF + import json, pathlib + + print("if(gRPC_BUILD_TESTS)") + for line in [ + json.dumps([t["name"], "./" + t["name"], *t["args"]]).translate( + str.maketrans(dict.fromkeys("[],", None)) + ) + for t in json.loads( + pathlib.Path("tools/run_tests/generated/tests.json").read_text() + ) + if "linux" in t["platforms"] and not t["flaky"] and not t.get("boringssl", False) + ]: + print(f" add_test({line})") + print("endif()") + EOF + + # Weird path issue. All tests except these two assume they are running from top-level src + # This is caused by running add_test from the top-level src dir. So WORKING_DIR becomes $S + # sed -i -E "s/lslash != nullptr/false/" "test/core/util/http_client/httpcli_test_util.cc" || die + # So we make it output to cmake/build as the code expects and run it from there. + cat >> "${S}/CMakeLists.txt" <<- EOF || die + if(gRPC_BUILD_TESTS) + set_target_properties(httpcli_test httpscli_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY "\${CMAKE_CURRENT_BINARY_DIR}/cmake/build") + set_tests_properties(httpcli_test httpscli_test PROPERTIES WORKING_DIRECTORY "\${CMAKE_CURRENT_BINARY_DIR}/cmake/build") + endif() + EOF + + mkdir "${S}/cmake/build" || die + + # Respect EPYTHON when testing, don't touch installed files otherwise + python_fix_shebang --force "${S}" + fi + + # Called via system() by some of the C++ sources, respect EPYTHON + sed -i -E "s#for p in #for p in \"${EPYTHON}\"#" "tools/distrib/python_wrapper.sh" || die + + cmake_src_prepare + + # un-hardcode libdir + sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die + +# # suppress network access, package builds fine without the submodules +# mkdir "${S}/third_party/opencensus-proto/src" || die +} + +src_configure() { + # https://github.com/grpc/grpc/issues/29652 + filter-lto + + local mycmakeargs=( + -DgRPC_DOWNLOAD_ARCHIVES="no" + -DgRPC_INSTALL="yes" + -DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}" + -DgRPC_INSTALL_LIBDIR="$(get_libdir)" + + -DgRPC_ABSL_PROVIDER="package" + -DgRPC_CARES_PROVIDER="package" + -DgRPC_PROTOBUF_PROVIDER="package" + -DgRPC_RE2_PROVIDER="package" + -DgRPC_SSL_PROVIDER="package" + -DgRPC_ZLIB_PROVIDER="package" + + -DgRPC_BUILD_TESTS="$(usex test)" + -DgRPC_USE_SYSTEMD="$(usex systemd ON OFF)" # Checks via STREQUAL + -DCMAKE_CXX_STANDARD=17 + ) + + if use test; then + mycmakeargs+=( + -DgRPC_BENCHMARK_PROVIDER="package" + ) + fi + + cmake_src_configure +} + +src_test() { + # This is normally done with start_port_server.py, but this forks and exits, + # while we need to capture the pid, so run it ourselves + "${EPYTHON}" "tools/run_tests/python_utils/port_server.py" \ + -p 32766 -l "${T}/port_server.log" & + local port_server_pid="${!}" + + # Reimplementation of what start_port_server.py does with curl + curl --retry 9999 --retry-all-errors --retry-max-time 120 \ + --fail --silent --output /dev/null "http://localhost:32766/get"; || die + + CMAKE_SKIP_TESTS=( + # CallCommandWithTimeoutDeadlineSet has a timeout set to 5000.25 seconds + ^grpc_tool_test$ + + # Needs network access + ^posix_event_engine_native_dns_test$ + ^posix_event_engine_test$ + ^resolve_address_using_ares_resolver_test$ + ^resolve_address_using_native_resolver_test$ + ) + + use amd64 && CMAKE_SKIP_TESTS+=( + ^examine_stack_test$ # fails on amd64 only + ^stack_tracer_test$ # fails on amd64 only + ) + + use alpha && CMAKE_SKIP_TESTS+=( + ^endpoint_pair_test$ # fails on alpha + ^event_poller_posix_test$ # fails on alpha + ^tcp_posix_test$ # fails on alpha + ) + + # BUG this should be nonfatal and we kill the server even when tests fail + # nonfatal \ + cmake_src_test + + kill "${port_server_pid}" || die +} + +src_install() { + cmake_src_install + + if use examples; then + find examples -name '.gitignore' -delete || die + dodoc -r examples + docompress -x "/usr/share/doc/${PF}/examples" + fi + + if use doc; then + find doc -name '.gitignore' -delete || die + local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. ) + fi + + einstalldocs +}
