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 A3516158086 for ; Fri, 3 Dec 2021 18:09:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98C13E0729; Fri, 3 Dec 2021 18:09:33 +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 22CA7E0729 for ; Fri, 3 Dec 2021 18:09:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 CC32534320E 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 F376479 for ; Fri, 3 Dec 2021 18:09:29 +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: <1638554966.3cd6d3273c98da84571084ce2e814c2bbb2d6bb3.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt-sanitizers/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild X-VCS-Directories: sys-libs/compiler-rt-sanitizers/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3cd6d3273c98da84571084ce2e814c2bbb2d6bb3 X-VCS-Branch: master Date: Fri, 3 Dec 2021 18:09:29 +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: a68c30e7-224f-4864-be43-7dfb9323e7d0 X-Archives-Hash: 9cf705b9efc3ec765679cced1f729815 commit: 3cd6d3273c98da84571084ce2e814c2bbb2d6bb3 Author: Michał Górny gentoo org> AuthorDate: Fri Dec 3 18:06:10 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Dec 3 18:09:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cd6d327 sys-libs/compiler-rt-sanitizers: Add ABI_X86 flags Signed-off-by: Michał Górny gentoo.org> .../compiler-rt-sanitizers-13.0.1.9999.ebuild | 14 ++++++++++++-- .../compiler-rt-sanitizers-13.0.1_rc1.ebuild | 14 ++++++++++++-- .../compiler-rt-sanitizers-14.0.0.9999.ebuild | 14 ++++++++++++-- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild index 80c9d7d0f6b4..14e8ad24e742 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild @@ -3,8 +3,10 @@ EAPI=7 +MULTILIB_COMPAT=( abi_x86_{32,64} ) PYTHON_COMPAT=( python3_{8..10} ) -inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 +inherit check-reqs cmake flag-o-matic llvm llvm.org multilib-build \ + python-any-r1 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/" @@ -34,7 +36,7 @@ CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" >=sys-devel/llvm-6 - virtual/libcrypt" + virtual/libcrypt[${MULTILIB_USEDEP}]" BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) @@ -137,6 +139,14 @@ 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 test; then mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild index 8c47c346f451..9c861d2942be 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild @@ -3,8 +3,10 @@ EAPI=7 +MULTILIB_COMPAT=( abi_x86_{32,64} ) PYTHON_COMPAT=( python3_{8..10} ) -inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 +inherit check-reqs cmake flag-o-matic llvm llvm.org multilib-build \ + python-any-r1 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/" @@ -34,7 +36,7 @@ CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" >=sys-devel/llvm-6 - virtual/libcrypt" + virtual/libcrypt[${MULTILIB_USEDEP}]" BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) @@ -137,6 +139,14 @@ 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 test; then mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild index 97edc3f19193..bfbb1896914d 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild @@ -3,8 +3,10 @@ EAPI=7 +MULTILIB_COMPAT=( abi_x86_{32,64} ) PYTHON_COMPAT=( python3_{8..10} ) -inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 +inherit check-reqs cmake flag-o-matic llvm llvm.org multilib-build \ + python-any-r1 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/" @@ -34,7 +36,7 @@ CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" >=sys-devel/llvm-6 - virtual/libcrypt" + virtual/libcrypt[${MULTILIB_USEDEP}]" BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) @@ -137,6 +139,14 @@ 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 test; then mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"