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 86EF1158086 for ; Sat, 4 Dec 2021 13:26:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4774D2BC020; Sat, 4 Dec 2021 13:26:00 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B13C22BC002 for ; Sat, 4 Dec 2021 13:25:59 +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 3C12F342D7D for ; Sat, 4 Dec 2021 13:25:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 515C21A0 for ; Sat, 4 Dec 2021 13:25:56 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1638624352.62918c71ef476e5e09f94a2291704111e1dd4a3f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild X-VCS-Directories: sys-libs/compiler-rt/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 62918c71ef476e5e09f94a2291704111e1dd4a3f X-VCS-Branch: master Date: Sat, 4 Dec 2021 13:25:56 +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: c7b9ac7b-67e8-4012-a03e-18a002764c45 X-Archives-Hash: f1375539fd2eda9c254b461af8c3e256 commit: 62918c71ef476e5e09f94a2291704111e1dd4a3f Author: Michał Górny gentoo org> AuthorDate: Sat Dec 4 13:23:11 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Dec 4 13:25:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62918c71 sys-libs/compiler-rt: Inline ABI_X86 flags to fix non-x86 arches Inline ABI_X86 flags instead of using multilib-build, as the latter injects a REQUIRED_USE constraint that is impossible to satisfy on non-x86 architectures. Signed-off-by: Michał Górny gentoo.org> sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild | 6 ++---- sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild | 6 ++---- sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild index ef78484f7721..0a82b041cbde 100644 --- a/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild @@ -3,10 +3,8 @@ EAPI=7 -MULTILIB_COMPAT=( abi_x86_{32,64} ) PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \ - toolchain-funcs +inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" @@ -14,7 +12,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" KEYWORDS="" -IUSE="+clang debug test" +IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" CLANG_SLOT=${SLOT%%.*} diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild index 59324e768209..3c0553bcebbd 100644 --- a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild @@ -3,10 +3,8 @@ EAPI=7 -MULTILIB_COMPAT=( abi_x86_{32,64} ) PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \ - toolchain-funcs +inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" @@ -14,7 +12,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" KEYWORDS="" -IUSE="+clang debug test" +IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" CLANG_SLOT=${SLOT%%.*} diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild index f8402de337a2..3d2048549e73 100644 --- a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild @@ -3,10 +3,8 @@ EAPI=7 -MULTILIB_COMPAT=( abi_x86_{32,64} ) PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \ - toolchain-funcs +inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" @@ -14,7 +12,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" KEYWORDS="" -IUSE="+clang debug test" +IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" CLANG_SLOT=${SLOT%%.*}