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 B89BE15801B for ; Mon, 21 Aug 2023 17:27:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF7312BC03E; Mon, 21 Aug 2023 17:27:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 C56452BC03E for ; Mon, 21 Aug 2023 17:27:46 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7F9034125B for ; Mon, 21 Aug 2023 17:27:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4CAE81052 for ; Mon, 21 Aug 2023 17:27:44 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1692638842.e2225439e3338f92b391e7c33d69b12b833c71cb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild X-VCS-Directories: dev-cpp/abseil-cpp/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e2225439e3338f92b391e7c33d69b12b833c71cb X-VCS-Branch: master Date: Mon, 21 Aug 2023 17:27:44 +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: 70563511-0319-4c75-ab3d-9b3557fc1264 X-Archives-Hash: d9889f23af024e2830e1fc7e6e38e993 commit: e2225439e3338f92b391e7c33d69b12b833c71cb Author: Sam James gentoo org> AuthorDate: Mon Aug 21 17:23:52 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 21 17:27:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2225439 dev-cpp/abseil-cpp: unmultilibify, at least for now We're not bumping re2 to the new version which needs abseil as ideally we'll use bundled copies instead. Although as with grpc + protobuf, unclear if we can actually do that given it then tries to install its own abseil. Bug: https://bugs.gentoo.org/912281 Signed-off-by: Sam James gentoo.org> dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild index b5d25058e213..10dd19ada8e9 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake-multilib python-any-r1 +inherit cmake python-any-r1 DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" HOMEPAGE="https://abseil.io/" @@ -45,7 +45,7 @@ src_prepare() { absl/copts/generate_copts.py || die } -multilib_src_configure() { +src_configure() { local mycmakeargs=( # We use -std=c++14 here so that abseil-cpp's string_view is used # See the discussion in https://github.com/gentoo/gentoo/pull/32281.