From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0AA74158066 for ; Wed, 4 Sep 2024 09:32:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 593FEE29FE; Wed, 4 Sep 2024 09:32:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31CEAE29FE for ; Wed, 4 Sep 2024 09:32:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 43ACE33C1EB for ; Wed, 4 Sep 2024 09:32:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D396E1DD4 for ; Wed, 4 Sep 2024 09:32:26 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1725442316.3d768fd8e48e4f30636a17193aea26f9bae6bc38.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/grpc/Manifest net-libs/grpc/grpc-1.66.0.ebuild X-VCS-Directories: net-libs/grpc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3d768fd8e48e4f30636a17193aea26f9bae6bc38 X-VCS-Branch: master Date: Wed, 4 Sep 2024 09:32:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4dfde18d-dd27-4d8c-be5a-088ea4364630 X-Archives-Hash: 991b185b7d197d941e6b75ed24296392 commit: 3d768fd8e48e4f30636a17193aea26f9bae6bc38 Author: Paul Zander gmail com> AuthorDate: Fri Aug 30 19:48:14 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Sep 4 09:31:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d768fd8 net-libs/grpc: add 1.66.0 Signed-off-by: Paul Zander gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38356 Signed-off-by: Sam James gentoo.org> net-libs/grpc/Manifest | 1 + net-libs/grpc/grpc-1.66.0.ebuild | 324 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 325 insertions(+) diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index 15bd602fc31c..03554fdb6e8f 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -5,3 +5,4 @@ DIST grpc-1.57.0.tar.gz 17337863 BLAKE2B 10c6fb35f606806aeb25cd55dd993d9af168eb8 DIST grpc-1.60.0.tar.gz 17442762 BLAKE2B 35cc0ea938deb848ca91e3d5f8879b85b80f94ac09b582600f05fee1f55c162ae98f2f744480f69d78e78da0c0f2d9e198f812101daaa1f1959869f26ba7d97a SHA512 91c2406ed4198509ac0d5360b3da6898fa4f40f459eb6fff541faa44cc238eed98fd7489e7ef7a80a6f4a318bc5b9130eaa0ba1beaa358d1c074fc82825648ff 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 diff --git a/net-libs/grpc/grpc-1.66.0.ebuild b/net-libs/grpc/grpc-1.66.0.ebuild new file mode 100644 index 000000000000..af53605f1ca3 --- /dev/null +++ b/net-libs/grpc/grpc-1.66.0.ebuild @@ -0,0 +1,324 @@ +# Copyright 1999-2024 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" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.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/43.166" +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.65.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() { + # 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" + "\${_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}" - <<-EOF | tee -a "CMakeLists.txt" + 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 + sed -i -E "s/lslash != nullptr/false/" "test/core/http/httpcli_test_util.cc" || die + + # 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 + + # Respect EPYTHON when testing, don't touch installed files otherwise + use test && python_fix_shebang --force "${S}" + + 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 + + soversion_check +} + +src_configure() { + # https://github.com/grpc/grpc/issues/29652 + filter-lto + + local mycmakeargs=( + -DgRPC_DOWNLOAD_ARCHIVES=OFF + -DgRPC_INSTALL=ON + -DgRPC_ABSL_PROVIDER=package + -DgRPC_CARES_PROVIDER=package + -DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}" + -DgRPC_INSTALL_LIBDIR="$(get_libdir)" + -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) + -DCMAKE_CXX_STANDARD=17 + $(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '') + ) + 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$ + + # Need 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 + ) + + # NOTE breaks with shared linking because the metric is twice initialised in a static function in a anonymous + # namespace + # metrics.cc:49] Metric name grpc.lb.pick_first.disconnections has already been registered. + # https://bugs.gentoo.org/935787 Leave the bug open until we fixed the underlying issue + CMAKE_SKIP_TESTS+=( + ^bad_ping_test$ + ^binary_metadata_test$ + ^call_creds_test$ + ^call_host_override_test$ + ^cancel_after_accept_test$ + ^cancel_after_client_done_test$ + ^cancel_after_invoke_test$ + ^cancel_after_round_trip_test$ + ^cancel_before_invoke_test$ + ^cancel_in_a_vacuum_test$ + ^cancel_with_status_test$ + ^client_streaming_test$ + ^compressed_payload_test$ + ^connectivity_test$ + ^default_host_test$ + ^disappearing_server_test$ + ^empty_batch_test$ + ^filter_causes_close_test$ + ^filter_init_fails_test$ + ^filter_test_test$ + ^filtered_metadata_test$ + ^graceful_server_shutdown_test$ + ^grpc_authz_test$ + ^high_initial_seqno_test$ + ^hpack_size_test$ + ^http2_stats_test$ + ^invoke_large_request_test$ + ^keepalive_timeout_test$ + ^large_metadata_test$ + ^max_concurrent_streams_test$ + ^max_connection_age_test$ + ^max_connection_idle_test$ + ^max_message_length_test$ + ^negative_deadline_test$ + ^no_logging_test$ + ^no_op_test$ + ^payload_test$ + ^ping_pong_streaming_test$ + ^ping_test$ + ^proxy_auth_test$ + ^registered_call_test$ + ^request_with_flags_test$ + ^request_with_payload_test$ + ^resource_quota_server_test$ + ^retry_cancel_after_first_attempt_starts_test$ + ^retry_cancel_during_delay_test$ + ^retry_cancel_with_multiple_send_batches_test$ + ^retry_cancellation_test$ + ^retry_disabled_test$ + ^retry_exceeds_buffer_size_in_delay_test$ + ^retry_exceeds_buffer_size_in_initial_batch_test$ + ^retry_exceeds_buffer_size_in_subsequent_batch_test$ + ^retry_lb_drop_test$ + ^retry_lb_fail_test$ + ^retry_non_retriable_status_before_trailers_test$ + ^retry_non_retriable_status_test$ + ^retry_per_attempt_recv_timeout_on_last_attempt_test$ + ^retry_per_attempt_recv_timeout_test$ + ^retry_recv_initial_metadata_test$ + ^retry_recv_message_replay_test$ + ^retry_recv_message_test$ + ^retry_recv_trailing_metadata_error_test$ + ^retry_send_initial_metadata_refs_test$ + ^retry_send_op_fails_test$ + ^retry_send_recv_batch_test$ + ^retry_server_pushback_delay_test$ + ^retry_server_pushback_disabled_test$ + ^retry_streaming_after_commit_test$ + ^retry_streaming_succeeds_before_replay_finished_test$ + ^retry_streaming_test$ + ^retry_test$ + ^retry_throttled_test$ + ^retry_too_many_attempts_test$ + ^retry_transparent_goaway_test$ + ^retry_transparent_max_concurrent_streams_test$ + ^retry_transparent_not_sent_on_wire_test$ + ^retry_unref_before_finish_test$ + ^retry_unref_before_recv_test$ + ^server_finishes_request_test$ + ^server_streaming_test$ + ^shutdown_finishes_calls_test$ + ^shutdown_finishes_tags_test$ + ^simple_delayed_request_test$ + ^simple_metadata_test$ + ^simple_request_test$ + ^streaming_error_response_test$ + ^test_core_end2end_channelz_test$ + ^thread_pool_test$ + ^timeout_before_request_call_test$ + ^trailing_metadata_test$ + ^write_buffering_at_end_test$ + ^write_buffering_test$ + ) + + # BUG this should be nonfatal and we kill the server even when tests fail + 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 +}