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 DE4F315801B for ; Mon, 21 Aug 2023 17:31:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D7082BC03F; Mon, 21 Aug 2023 17:31:19 +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 71B1F2BC03F for ; Mon, 21 Aug 2023 17:31:18 +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 BEAF5341230 for ; Mon, 21 Aug 2023 17:31:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2840F1054 for ; Mon, 21 Aug 2023 17:31:16 +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: <1692639008.99e8c24380bb00f90ed98cc36e0451e245d1e8f4.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-20230125.2.ebuild 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: 99e8c24380bb00f90ed98cc36e0451e245d1e8f4 X-VCS-Branch: master Date: Mon, 21 Aug 2023 17:31:16 +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: 5e301208-1363-43f4-89ea-68807e69804c X-Archives-Hash: 48954e0b63050a418b229a10d160c9ed commit: 99e8c24380bb00f90ed98cc36e0451e245d1e8f4 Author: Stephan Hartmann gentoo org> AuthorDate: Sun Jun 11 16:13:07 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 21 17:30:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e8c243 dev-cpp/abseil-cpp: add multilib support Needed by protobuf. Closes: https://bugs.gentoo.org/908372 Signed-off-by: Stephan Hartmann gentoo.org> Signed-off-by: Sam James gentoo.org> dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild | 5 +++-- dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild index f80007d0052b..a2402a45796c 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) -inherit cmake python-any-r1 +inherit cmake-multilib python-any-r1 # yes, it needs SOURCE, not just installed one GTEST_COMMIT="v1.13.0" @@ -56,7 +56,7 @@ src_prepare() { fi } -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DCMAKE_CXX_STANDARD=17 -DABSL_ENABLE_INSTALL=TRUE @@ -65,5 +65,6 @@ src_configure() { -DABSL_BUILD_TESTING=$(usex test ON OFF) $(usex test -DBUILD_TESTING=ON '') #intentional usex, it used both variables for tests. ) + cmake_src_configure } diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild index 10dd19ada8e9..b5d25058e213 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 python-any-r1 +inherit cmake-multilib 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 } -src_configure() { +multilib_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.