commit: ef8d2693b1de0f2c4a0ceb388c1c082bb5477888
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Apr 11 10:38:25 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 11 10:39:09 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef8d2693
net-libs/grpc: 1.71.0 conditionally apply gtest patch
Patch depends on replacing the included libs from gtest/abseil-cpp. And breaks
without USE=test.
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/grpc/grpc-1.71.0.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net-libs/grpc/grpc-1.71.0.ebuild b/net-libs/grpc/grpc-1.71.0.ebuild
index c745ed62f6b1..7a8547ed98ce 100644
--- a/net-libs/grpc/grpc-1.71.0.ebuild
+++ b/net-libs/grpc/grpc-1.71.0.ebuild
@@ -73,7 +73,6 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-1.71.0-fix-already-registered.patch"
"${FILESDIR}/${PN}-1.71.0-system-gtest.patch"
)
@@ -173,6 +172,9 @@ src_prepare() {
# 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
