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 EAA56158086 for ; Fri, 3 Dec 2021 18:09:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95990E0636; Fri, 3 Dec 2021 18:09:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC569E0636 for ; Fri, 3 Dec 2021 18:09:32 +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 D564B343231 for ; Fri, 3 Dec 2021 18:09:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1479E14D for ; Fri, 3 Dec 2021 18:09:30 +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: <1638554967.625c72824647153264673e16d56a4f1729417506.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: 625c72824647153264673e16d56a4f1729417506 X-VCS-Branch: master Date: Fri, 3 Dec 2021 18:09:30 +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: d14a5ec7-68b8-4778-8843-986e9235eed1 X-Archives-Hash: cd18dbd79334b5bab35beeddb7d834ec commit: 625c72824647153264673e16d56a4f1729417506 Author: Michał Górny gentoo org> AuthorDate: Fri Dec 3 18:08:15 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Dec 3 18:09:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625c7282 sys-libs/compiler-rt: Add ABI_X86 flags Signed-off-by: Michał Górny gentoo.org> sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild | 11 ++++++++++- sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild | 11 ++++++++++- sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 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 d6a1a16eb346..ef78484f7721 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,8 +3,10 @@ EAPI=7 +MULTILIB_COMPAT=( abi_x86_{32,64} ) PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs +inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \ + toolchain-funcs DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" @@ -94,6 +96,13 @@ src_configure() { -DPython3_EXECUTABLE="${PYTHON}" ) + if use amd64; then + mycmakeargs+=( + -DCAN_TARGET_i386=$(usex abi_x86_32) + -DCAN_TARGET_x86_64=$(usex abi_x86_64) + ) + fi + if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then mycmakeargs+=( # setting -isysroot is disabled with compiler-rt-prefix-paths.patch 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 23214f0469bf..59324e768209 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,8 +3,10 @@ EAPI=7 +MULTILIB_COMPAT=( abi_x86_{32,64} ) PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs +inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \ + toolchain-funcs DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" @@ -94,6 +96,13 @@ src_configure() { -DPython3_EXECUTABLE="${PYTHON}" ) + if use amd64; then + mycmakeargs+=( + -DCAN_TARGET_i386=$(usex abi_x86_32) + -DCAN_TARGET_x86_64=$(usex abi_x86_64) + ) + fi + if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then mycmakeargs+=( # setting -isysroot is disabled with compiler-rt-prefix-paths.patch 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 0928ea166320..f8402de337a2 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,8 +3,10 @@ EAPI=7 +MULTILIB_COMPAT=( abi_x86_{32,64} ) PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs +inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \ + toolchain-funcs DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" @@ -94,6 +96,13 @@ src_configure() { -DPython3_EXECUTABLE="${PYTHON}" ) + if use amd64; then + mycmakeargs+=( + -DCAN_TARGET_i386=$(usex abi_x86_32) + -DCAN_TARGET_x86_64=$(usex abi_x86_64) + ) + fi + if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then mycmakeargs+=( # setting -isysroot is disabled with compiler-rt-prefix-paths.patch