net-libs/grpc: add 1.75.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
2025-09-26 15:32:29 +02:00
committed by Sam James
parent 06b10eee02
commit 13eebb9ee2
3 changed files with 399 additions and 0 deletions

View File

@@ -2,5 +2,7 @@ DIST envoi-api-4de3c74cf21a9958c1cf26d8993c55c6e0d28b49.tar.gz 697162 BLAKE2B ef
DIST googleapis-fe8ba054ad4f7eca946c2d14a63c3f07c0b586a0.tar.gz 9166557 BLAKE2B 83f2c9ae73075bb2d7860632e058a968153d3b74625cc044cfa0768ffc7bf84ae1dca115976fa1fe02d46b870996e5e64524f59cb62401434ee4d482642766b6 SHA512 d77ea83f8e68e3c0b667e7de43c2cd28b0ca7b969b2cf127b3873fc19f330ad85afb314bef4174a4e11ed68b620e43853d8b44eb833c5eca7e820ca21c1c3e15
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 grpc-1.75.1.gh.tar.gz 15252613 BLAKE2B 5919ed80a7d723875b586ec9ed46e9f2921223dc459403184c35502a7768d9d7ead978a302b4b9d15fa3645c088a6344c6488d519ea7e9f9a7889465264a0467 SHA512 ffc3fde817f60e151cb2d2c0980485faf15270c12f2ec5f1228ef595d019ddf3c5e977f974cb8d5911010e0083652edddade1e999155a2fa2e72c3fd3a1aefb2
DIST protoc-gen-validate-32c2415389a3538082507ae537e7edd9578c64ed.tar.gz 183819 BLAKE2B fc7694c2a11a1d47a7e9c1038fd0792d5cfbe9976a43c9f7843a4c5eee36e5bdb4945e9e1fc23f9dde3af00c74dacec9d77f1078d47581b0e1732d4c097b0f81 SHA512 be87721eb350b9ee4a0cd03fcd15a9a89dd17b46929f53614b4696133b4b8417d35e36012da6d59991b70d3c349a8d43ee402e00968943f3dd006deb9a973fdc
DIST protoc-gen-validate-7b06248484ceeaa947e93ca2747eccf336a88ecc.tar.gz 193674 BLAKE2B 2a37f7dd61509aed2a3c9421b0e1aca1a29994126a998219a3c8cda8de7331d98951846d2c4311cf2eb682017f4379dad4d6da7d1585b748dd9a46001507d078 SHA512 5959ae367093c70b697fc5b357598be513ffdc37230a0299a58b2a783ddc83c0511a8b6a27f20b03bfa93a515b47bbb51a7f6076fab90b2474032e34244b7c08
DIST xds-3a472e524827f72d1ad621c4983dd5af54c46776.tar.gz 104469 BLAKE2B 656f360de57d53a094775bb197f28cf74670973f718c54ad62bc45c8c917a392c7f69c04cbf9291999b372fc21c6c321930ccd51c99b867ede9d1811ea23fdf5 SHA512 9e2d205bb8924294b29c42c454c5c65361d05abf511636f9c9a6ff5335d7f6408edef9f7576a5c81ccdaefe79dc08971950211bd4eb188b1e2142a60f9eae509

View File

@@ -0,0 +1,37 @@
From 50f44041226a2f7e73232f07269bd624dc273c2c Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Wed, 20 Aug 2025 11:12:55 +0200
Subject: [PATCH] fix missing __stop_linkarr_upb_AllExts
Change link order
FAILED: [code=1] grpc_cli
/usr/lib/gcc/x86_64-pc-linux-gnu/16/../../../../x86_64-pc-linux-gnu/bin/ld:
/usr/lib64/libupb.a(extension_registry.c.o): undefined reference to symbol
'__stop_linkarr_upb_AllExts'
/usr/lib/gcc/x86_64-pc-linux-gnu/16/../../../../x86_64-pc-linux-gnu/bin/ld:
libupb_mini_table_lib.so.49.0.0: error adding symbols: DSO missing from command
line
collect2: error: ld returned 1 exit status
See-also: https://github.com/grpc/grpc/issues/40195
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1e7461..99b47cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19919,9 +19919,9 @@ target_include_directories(grpc_cli
target_link_libraries(grpc_cli
${_gRPC_ALLTARGETS_LIBRARIES}
- grpc++
${_gRPC_PROTOBUF_PROTOC_LIBRARIES}
grpc++_test_config
+ grpc++
)
--
2.51.0

View File

@@ -0,0 +1,360 @@
# 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_{11..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="7b06248484ceeaa947e93ca2747eccf336a88ecc"
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"
# NOTE
# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
SLOT="0/50.$(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-20250127:=
>=dev-libs/re2-0.2022.04.01:=
>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
>=dev-libs/protobuf-31.1:=
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-system-gtest.patch"
"${FILESDIR}/${PN}-1.74.1-fix-missing-__stop_linkarr_upb_AllExts.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}"
# NOTE doesn't apply if we don't replace gtest/abseil libs
eapply "${FILESDIR}/${PN}-1.71.0-fix-already-registered.patch"
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
)
if use test; then
mycmakeargs+=(
-DgRPC_BENCHMARK_PROVIDER="package"
)
fi
cmake_src_configure
}
src_test() {
prlimit --nofile=4096 --pid=$$
# 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=(
"^httpcli_test$"
# 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$
# TODO Needs SPIFFE
"^spiffe_bundle_map_end2end_test$"
^xds_listener_resource_type_test$
# 954185
'^server_test$'
# skipped via GTEST_FILTER
'^xds_audit_logger_registry_test$'
'^xds_common_types_test$'
'^xds_http_filters_test$'
'^xds_lb_policy_registry_test$'
'^xds_route_config_resource_type_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
)
# TODO make this test specific
local GTEST_SKIP_TESTS=(
xds_audit_logger_registry_test
XdsAuditLoggerRegistryTest.InvalidThirdPartyLoggerConfig
XdsAuditLoggerRegistryTest.ValidThirdPartyLogger
# xds_common_types_test
ExtractXdsExtensionTest.TypedStruct
ExtractXdsExtensionTest.TypedStructJsonConversion
ExtractXdsExtensionTest.TypedStructTypeUrlMissing
ExtractXdsExtensionTest.TypedStructTypeUrlNoSlash
ExtractXdsExtensionTest.TypedStructTypeUrlNothingAfterSlash
ExtractXdsExtensionTest.TypedStructWithInvalidProtobufStruct
ExtractXdsExtensionTest.UdpaTypedStruct
# xds_http_filters_test
"XdsFaultFilter/XdsFaultInjectionFilterConfigTest.BasicConfig/*"
"XdsFaultFilter/XdsFaultInjectionFilterConfigTest.HeaderAbortAndDelay/*"
"XdsRbacFilter/XdsRbacFilterConfigTest.AllPermissionTypes/*"
"XdsRbacFilter/XdsRbacFilterConfigTest.AllPrincipalTypes/*"
"XdsRbacFilter/XdsRbacFilterConfigTest.AuditLoggingOptionsIgnoredWithFeatureDisabled/*"
"XdsRbacFilter/XdsRbacFilterConfigTest.AuditLoggingOptions/*"
"XdsRbacFilter/XdsRbacFilterConfigTest.InvalidAuditLoggerConfig/*"
"XdsRbacFilter/XdsRbacFilterConfigTest.InvalidFieldsInPolicy/*"
"XdsRbacFilter/XdsRbacFilterConfigTest.InvalidHeaderMatchers/*"
"XdsRbacFilter/XdsRbacFilterConfigTest.InvalidStringMatchers/*"
"XdsRbacFilter/XdsRbacFilterConfigTest.InvalidPermissionAndPrincipal/*"
"XdsStatefulSessionFilter/XdsStatefulSessionFilterConfigTest.MinimalConfig/*"
"XdsStatefulSessionFilter/XdsStatefulSessionFilterConfigTest.PathAndTtl/*"
"XdsStatefulSessionFilter/XdsStatefulSessionFilterConfigTest.CookieNameNotPresent/*"
"XdsStatefulSessionFilter/XdsStatefulSessionFilterConfigTest.InvalidTtl/*"
"XdsStatefulSessionFilter/XdsStatefulSessionFilterConfigTest.TypedStructSessionState/*"
# xds_lb_policy_registry_test
CustomPolicy.Basic
WrrLocality.UnsupportedChildPolicyTypeSkipped
XdsLbPolicyRegistryTest.ErrorExtractingExtension
XdsLbPolicyRegistryTest.MaxRecursion
# xds_route_config_resource_type_test
RlsTest.Basic
RlsTest.DuplicateClusterSpecifierPluginNames
RlsTest.InvalidGrpcLbPolicyConfig
RlsTest.NotUsedInAllVirtualHosts
RlsTest.PluginDefinedButNotUsed
"RouteMatchTest.*"
"MaxStreamDurationTest.*"
VirtualHostTest.BadDomainPattern
VirtualHostTest.MultipleVirtualHosts
VirtualHostTest.NoDomainsSpecified
XdsRouteConfigTest.MinimumValidConfig
RetryPolicyOverrideTest.RoutePolicyOverridesVhostPolicy
)
local -x GTEST_FILTER
[[ -n ${GTEST_SKIP_TESTS[*]} ]] && GTEST_FILTER+="-$( IFS=':'; echo "${GTEST_SKIP_TESTS[*]}")"
# BUG this should be nonfatal and we kill the server even when tests fail
nonfatal \
cmake_src_test
local ret=$?
einfo "stopping start_port_server.py at PID ${port_server_pid}"
kill "${port_server_pid}" || die
[[ ${ret} -ne 0 ]] && die "cmake_src_test failed"
}
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
}