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 3FD62158094 for ; Thu, 28 Jul 2022 13:58:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DCB3E0B0F; Thu, 28 Jul 2022 13:58:42 +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 109E2E0B0F for ; Thu, 28 Jul 2022 13:58:42 +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 D5FEA341175 for ; Thu, 28 Jul 2022 13:58:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 222FB52C for ; Thu, 28 Jul 2022 13:58:39 +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: <1659016715.fd80c3800165f622ae6d46de4b6c8bf459e1a5a3.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/llvm-libunwind/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild sys-libs/llvm-libunwind/metadata.xml X-VCS-Directories: sys-libs/llvm-libunwind/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fd80c3800165f622ae6d46de4b6c8bf459e1a5a3 X-VCS-Branch: master Date: Thu, 28 Jul 2022 13:58:39 +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: f2a3a616-bdbe-4961-8b47-20a1c18ef207 X-Archives-Hash: 75207eec3f1f15da56475c279603735e commit: fd80c3800165f622ae6d46de4b6c8bf459e1a5a3 Author: Michał Górny gentoo org> AuthorDate: Thu Jul 28 13:09:32 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jul 28 13:58:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd80c380 sys-libs/llvm-libunwind: Build w/ clang by default, req. for tests Add IUSE=+clang to force building with clang by default. Require building with clang to run the test suite, and remove the test compiler hack that resulted in using clang with gcc-based config. Remove obsolete cmake args. Signed-off-by: Michał Górny gentoo.org> .../llvm-libunwind-15.0.0.9999.ebuild | 26 +++++++++++----------- sys-libs/llvm-libunwind/metadata.xml | 4 ++++ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild index 6d871c89b6b1..3be6f72f0fc7 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild @@ -13,7 +13,8 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="debug static-libs test" +IUSE="+clang debug static-libs test" +REQUIRED_USE="test? ( clang )" RESTRICT="!test? ( test )" RDEPEND=" @@ -24,11 +25,13 @@ DEPEND=" >=sys-devel/llvm-6 " BDEPEND=" + clang? ( + sys-devel/clang + ) !test? ( ${PYTHON_DEPS} ) test? ( - >=sys-devel/clang-3.9.0 $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') ) " @@ -46,6 +49,14 @@ multilib_src_configure() { local use_compiler_rt=OFF local libdir=$(get_libdir) + if use clang && ! tc-is-clang; then + # Only do this conditionally to allow overriding with + # e.g. CC=clang-13 in case of breakage + local -x CC=${CHOST}-clang + local -x CXX=${CHOST}-clang++ + strip-unsupported-flags + fi + # link to compiler-rt # https://github.com/gentoo/gentoo/pull/21516 if tc-is-clang; then @@ -65,7 +76,6 @@ multilib_src_configure() { -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs) -DLIBUNWIND_INCLUDE_TESTS=$(usex test) -DLIBUNWIND_INSTALL_HEADERS=ON - -DLIBUNWIND_TARGET_TRIPLE="${CHOST}" # support non-native unwinding; given it's small enough, # enable it unconditionally @@ -90,7 +100,6 @@ multilib_src_configure() { -DLIBCXX_LIBDIR_SUFFIX= -DLIBCXX_ENABLE_SHARED=OFF -DLIBCXX_ENABLE_STATIC=ON - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) @@ -101,15 +110,6 @@ multilib_src_configure() { fi cmake_src_configure - - if use test; then - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" - - # meh, we need to override the compiler explicitly - sed -e "/%{cxx}/s@, '.*'@, '${clang_path}'@" \ - -i "${BUILD_DIR}"/libunwind/test/lit.site.cfg || die - fi } multilib_src_test() { diff --git a/sys-libs/llvm-libunwind/metadata.xml b/sys-libs/llvm-libunwind/metadata.xml index 072910296ca3..9e58371ca860 100644 --- a/sys-libs/llvm-libunwind/metadata.xml +++ b/sys-libs/llvm-libunwind/metadata.xml @@ -7,4 +7,8 @@ llvm/llvm-project + + Force building using installed clang (rather + than the default CC/CXX; required for testing). +