commit: 39b0f7a6171777fd1898120dbb7841ea5d001c28 Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org> AuthorDate: Tue Feb 7 10:11:03 2023 +0000 Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org> CommitDate: Sat Feb 11 07:47:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b0f7a6
net-libs/grpc: filter-lto See: https://github.com/grpc/grpc/issues/29652 Closes: https://bugs.gentoo.org/861476 Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org> .../grpc/{grpc-1.51.1.ebuild => grpc-1.43.0-r1.ebuild} | 16 +++++++++------- .../grpc/{grpc-1.51.1.ebuild => grpc-1.51.1-r1.ebuild} | 5 ++++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/net-libs/grpc/grpc-1.51.1.ebuild b/net-libs/grpc/grpc-1.43.0-r1.ebuild similarity index 90% copy from net-libs/grpc/grpc-1.51.1.ebuild copy to net-libs/grpc/grpc-1.43.0-r1.ebuild index f3edebd3268c..2b89ffd2bc51 100644 --- a/net-libs/grpc/grpc-1.51.1.ebuild +++ b/net-libs/grpc/grpc-1.43.0-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI=7 -inherit cmake +inherit cmake flag-o-matic MY_PV="${PV//_pre/-pre}" @@ -13,13 +13,13 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt -SLOT="0/29.151" +SLOT="0/21.143" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" IUSE="doc examples test" # look for submodule versions in third_party dir RDEPEND=" - =dev-cpp/abseil-cpp-20220623.1*:= + =dev-cpp/abseil-cpp-20211102.0*:= >=dev-libs/re2-0.2021.11.01:= >=dev-libs/openssl-1.1.1:0=[-bindist(-)] >=dev-libs/protobuf-3.18.1:= @@ -58,15 +58,17 @@ src_prepare() { cmake_src_prepare # un-hardcode libdir + sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die 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 + # issue says 1.46.1 but apparently this is affected too + filter-lto + local mycmakeargs=( -DgRPC_INSTALL=ON -DgRPC_ABSL_PROVIDER=package diff --git a/net-libs/grpc/grpc-1.51.1.ebuild b/net-libs/grpc/grpc-1.51.1-r1.ebuild similarity index 96% rename from net-libs/grpc/grpc-1.51.1.ebuild rename to net-libs/grpc/grpc-1.51.1-r1.ebuild index f3edebd3268c..ed87698a72be 100644 --- a/net-libs/grpc/grpc-1.51.1.ebuild +++ b/net-libs/grpc/grpc-1.51.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake +inherit cmake flag-o-matic MY_PV="${PV//_pre/-pre}" @@ -67,6 +67,9 @@ src_prepare() { } src_configure() { + # https://github.com/grpc/grpc/issues/29652 + filter-lto + local mycmakeargs=( -DgRPC_INSTALL=ON -DgRPC_ABSL_PROVIDER=package
