mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-libs/grpc: drop 1.66.0 1.65.1
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44225 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Paul Zander
Sam James
@@ -1,7 +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.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 grpc-1.72.0.gh.tar.gz 14730317 BLAKE2B f4b16fcef3efa086cce043197e0d7bb6dc858074c329c3c993f33a5a65db72d8cf8106bc3d96cf72a12cf3040405e91f1d2fda2ac64b558ed00b18d6aef5821a SHA512 e56c37f6b2370426df63e700d9cf227864812911ae071f1c34626d0c336d6b6b42ca5d7cdc6d5d04744009aca6be8769fe9b0f15992f3aa2112e6166ed326f6a
|
||||
DIST protoc-gen-validate-32c2415389a3538082507ae537e7edd9578c64ed.tar.gz 183819 BLAKE2B fc7694c2a11a1d47a7e9c1038fd0792d5cfbe9976a43c9f7843a4c5eee36e5bdb4945e9e1fc23f9dde3af00c74dacec9d77f1078d47581b0e1732d4c097b0f81 SHA512 be87721eb350b9ee4a0cd03fcd15a9a89dd17b46929f53614b4696133b4b8417d35e36012da6d59991b70d3c349a8d43ee402e00968943f3dd006deb9a973fdc
|
||||
|
||||
@@ -1,84 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d4d798f..824c4ed 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -3504,77 +3504,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_14)
|
||||
-
|
||||
-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
|
||||
@@ -1,17 +0,0 @@
|
||||
|
||||
Fix build with abseil-cpp-20240722.0 which no longer implicitly
|
||||
includes absl/log/vlog_is_on.h
|
||||
|
||||
See: https://github.com/abseil/abseil-cpp/releases/tag/20240722.0
|
||||
Bug: https://bugs.gentoo.org/939015
|
||||
|
||||
--- grpc-1.65.1/src/core/util/log.cc~ 2024-07-17 00:53:49.000000000 +0200
|
||||
+++ grpc-1.65.1/src/core/util/log.cc 2024-09-04 09:28:18.494476262 +0200
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <grpc/support/port_platform.h>
|
||||
|
||||
#include "absl/log/log.h"
|
||||
+#include "absl/log/vlog_is_on.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
@@ -1,324 +0,0 @@
|
||||
# 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..12} )
|
||||
inherit cmake flag-o-matic python-any-r1
|
||||
|
||||
MY_PV="${PV//_pre/-pre}"
|
||||
|
||||
DESCRIPTION="Modern open source high performance RPC framework"
|
||||
HOMEPAGE="https://www.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/42.165"
|
||||
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"
|
||||
"${FILESDIR}/${PN}-1.65.0-vlog.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
|
||||
}
|
||||
@@ -1,324 +0,0 @@
|
||||
# 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
|
||||
}
|
||||
Reference in New Issue
Block a user