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 6ECF115800F for ; Sat, 11 Feb 2023 07:47:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A847DE07AE; Sat, 11 Feb 2023 07:47:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 9178FE07AE for ; Sat, 11 Feb 2023 07:47:45 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A4B734085A for ; Sat, 11 Feb 2023 07:47:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AEC0B893 for ; Sat, 11 Feb 2023 07:47:42 +0000 (UTC) From: "WANG Xuerui" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "WANG Xuerui" Message-ID: <1676101628.39b0f7a6171777fd1898120dbb7841ea5d001c28.xen0n@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/grpc/grpc-1.43.0-r1.ebuild net-libs/grpc/grpc-1.51.1-r1.ebuild net-libs/grpc/grpc-1.51.1.ebuild X-VCS-Directories: net-libs/grpc/ X-VCS-Committer: xen0n X-VCS-Committer-Name: WANG Xuerui X-VCS-Revision: 39b0f7a6171777fd1898120dbb7841ea5d001c28 X-VCS-Branch: master Date: Sat, 11 Feb 2023 07:47:42 +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: 51a2f68c-4297-47ef-9684-326ed14b2dc7 X-Archives-Hash: 1e24d8fcdb11fde5aa0ed5ac32e082d3 commit: 39b0f7a6171777fd1898120dbb7841ea5d001c28 Author: WANG Xuerui gentoo org> AuthorDate: Tue Feb 7 10:11:03 2023 +0000 Commit: WANG Xuerui gentoo 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 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