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 4A2B3158086 for ; Wed, 1 Dec 2021 16:47:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BFE9E07E0; Wed, 1 Dec 2021 16:47:32 +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 D7D00E07E0 for ; Wed, 1 Dec 2021 16:47:31 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87850342FA8 for ; Wed, 1 Dec 2021 16:47:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 383081E4 for ; Wed, 1 Dec 2021 16:47: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: <1638377244.cbbdb0e5654758480ca89a7cc516981ebf81ddc4.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxxabi/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild X-VCS-Directories: sys-libs/libcxxabi/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: cbbdb0e5654758480ca89a7cc516981ebf81ddc4 X-VCS-Branch: master Date: Wed, 1 Dec 2021 16:47: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: 85fff26a-2f57-4735-934f-dfaf72e8b6ef X-Archives-Hash: b84e4abad270d51a81dc443952f64b35 commit: cbbdb0e5654758480ca89a7cc516981ebf81ddc4 Author: Michał Górny gentoo org> AuthorDate: Wed Dec 1 16:41:19 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Dec 1 16:47:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbbdb0e5 sys-libs/libcxxabi: Set target triple unconditionally to fix clangrt Set target triple unconditionally in order to fix failing builds against compiler-rt. Closes: https://bugs.gentoo.org/827943 Signed-off-by: Michał Górny gentoo.org> sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild | 3 ++- sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild | 3 ++- sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild | 3 ++- sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild index 08e4724c0259..628752042eea 100644 --- a/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild @@ -75,6 +75,7 @@ multilib_src_configure() { # upstream is omitting standard search path for this # probably because gcc & clang are bundling their own unwind.h -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include + -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" ) if use test; then local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) @@ -84,7 +85,6 @@ multilib_src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" -DPython3_EXECUTABLE="${PYTHON}" - -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" ) fi cmake_src_configure @@ -105,6 +105,7 @@ wrap_libcxx() { -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) -DLIBCXX_HAS_GCC_S_LIB=OFF -DLIBCXX_INCLUDE_TESTS=OFF + -DLIBCXX_TARGET_TRIPLE="${CHOST}" ) "${@}" diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild index 66ecb7faa6ed..36ccca5e938a 100644 --- a/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild @@ -75,6 +75,7 @@ multilib_src_configure() { # upstream is omitting standard search path for this # probably because gcc & clang are bundling their own unwind.h -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include + -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" ) if use test; then local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) @@ -84,7 +85,6 @@ multilib_src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" -DPython3_EXECUTABLE="${PYTHON}" - -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" ) fi cmake_src_configure @@ -105,6 +105,7 @@ wrap_libcxx() { -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) -DLIBCXX_HAS_GCC_S_LIB=OFF -DLIBCXX_INCLUDE_TESTS=OFF + -DLIBCXX_TARGET_TRIPLE="${CHOST}" ) "${@}" diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild index 66ecb7faa6ed..36ccca5e938a 100644 --- a/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild @@ -75,6 +75,7 @@ multilib_src_configure() { # upstream is omitting standard search path for this # probably because gcc & clang are bundling their own unwind.h -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include + -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" ) if use test; then local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) @@ -84,7 +85,6 @@ multilib_src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" -DPython3_EXECUTABLE="${PYTHON}" - -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" ) fi cmake_src_configure @@ -105,6 +105,7 @@ wrap_libcxx() { -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) -DLIBCXX_HAS_GCC_S_LIB=OFF -DLIBCXX_INCLUDE_TESTS=OFF + -DLIBCXX_TARGET_TRIPLE="${CHOST}" ) "${@}" diff --git a/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild index 66ecb7faa6ed..36ccca5e938a 100644 --- a/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild @@ -75,6 +75,7 @@ multilib_src_configure() { # upstream is omitting standard search path for this # probably because gcc & clang are bundling their own unwind.h -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include + -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" ) if use test; then local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) @@ -84,7 +85,6 @@ multilib_src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" -DPython3_EXECUTABLE="${PYTHON}" - -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" ) fi cmake_src_configure @@ -105,6 +105,7 @@ wrap_libcxx() { -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) -DLIBCXX_HAS_GCC_S_LIB=OFF -DLIBCXX_INCLUDE_TESTS=OFF + -DLIBCXX_TARGET_TRIPLE="${CHOST}" ) "${@}"