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 8C72F1581D0 for ; Sat, 10 Feb 2024 11:13:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AD55E2B29; Sat, 10 Feb 2024 11:13:19 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11258E2B29 for ; Sat, 10 Feb 2024 11:13:19 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 528503431D6 for ; Sat, 10 Feb 2024 11:13:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7293414D1 for ; Sat, 10 Feb 2024 11:13:15 +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: <1707563590.f236074cd4d5cb8f6496235f4b0a934292b73986.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxx/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcxx/libcxx-18.1.0_rc2.ebuild sys-libs/libcxx/libcxx-19.0.0.9999.ebuild sys-libs/libcxx/libcxx-19.0.0_pre20240203.ebuild X-VCS-Directories: sys-libs/libcxx/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f236074cd4d5cb8f6496235f4b0a934292b73986 X-VCS-Branch: master Date: Sat, 10 Feb 2024 11:13:15 +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: 15f60d94-5ccb-4654-a92f-2a8ac6e53692 X-Archives-Hash: 722b90e7c7d3290eb7bcc7e35508edc7 commit: f236074cd4d5cb8f6496235f4b0a934292b73986 Author: Michał Górny gentoo org> AuthorDate: Sat Feb 10 11:05:39 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Feb 10 11:13:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f236074c sys-libs/libcxx: Migrate to llvm-utils Signed-off-by: Michał Górny gentoo.org> sys-libs/libcxx/libcxx-18.1.0_rc2.ebuild | 12 ++++-------- sys-libs/libcxx/libcxx-19.0.0.9999.ebuild | 12 ++++-------- sys-libs/libcxx/libcxx-19.0.0_pre20240203.ebuild | 12 ++++-------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/sys-libs/libcxx/libcxx-18.1.0_rc2.ebuild b/sys-libs/libcxx/libcxx-18.1.0_rc2.ebuild index a24b477a5ab8..c205f3f21b57 100644 --- a/sys-libs/libcxx/libcxx-18.1.0_rc2.ebuild +++ b/sys-libs/libcxx/libcxx-18.1.0_rc2.ebuild @@ -4,8 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \ - toolchain-funcs +inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 +inherit toolchain-funcs DESCRIPTION="New implementation of the C++ standard library, targeting C++11" HOMEPAGE="https://libcxx.llvm.org/" @@ -48,12 +48,6 @@ python_check_deps() { } pkg_setup() { - # Darwin Prefix builds do not have llvm installed yet, so rely on - # bootstrap-prefix to set the appropriate path vars to LLVM instead - # of using llvm_pkg_setup. - if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - fi python-any-r1_pkg_setup if ! use libcxxabi && ! tc-is-gcc ; then @@ -79,6 +73,8 @@ test_compiler() { } src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + # note: we need to do this before multilib kicks in since it will # alter the CHOST local cxxabi cxxabi_incs diff --git a/sys-libs/libcxx/libcxx-19.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-19.0.0.9999.ebuild index a24b477a5ab8..c205f3f21b57 100644 --- a/sys-libs/libcxx/libcxx-19.0.0.9999.ebuild +++ b/sys-libs/libcxx/libcxx-19.0.0.9999.ebuild @@ -4,8 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \ - toolchain-funcs +inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 +inherit toolchain-funcs DESCRIPTION="New implementation of the C++ standard library, targeting C++11" HOMEPAGE="https://libcxx.llvm.org/" @@ -48,12 +48,6 @@ python_check_deps() { } pkg_setup() { - # Darwin Prefix builds do not have llvm installed yet, so rely on - # bootstrap-prefix to set the appropriate path vars to LLVM instead - # of using llvm_pkg_setup. - if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - fi python-any-r1_pkg_setup if ! use libcxxabi && ! tc-is-gcc ; then @@ -79,6 +73,8 @@ test_compiler() { } src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + # note: we need to do this before multilib kicks in since it will # alter the CHOST local cxxabi cxxabi_incs diff --git a/sys-libs/libcxx/libcxx-19.0.0_pre20240203.ebuild b/sys-libs/libcxx/libcxx-19.0.0_pre20240203.ebuild index a24b477a5ab8..c205f3f21b57 100644 --- a/sys-libs/libcxx/libcxx-19.0.0_pre20240203.ebuild +++ b/sys-libs/libcxx/libcxx-19.0.0_pre20240203.ebuild @@ -4,8 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \ - toolchain-funcs +inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 +inherit toolchain-funcs DESCRIPTION="New implementation of the C++ standard library, targeting C++11" HOMEPAGE="https://libcxx.llvm.org/" @@ -48,12 +48,6 @@ python_check_deps() { } pkg_setup() { - # Darwin Prefix builds do not have llvm installed yet, so rely on - # bootstrap-prefix to set the appropriate path vars to LLVM instead - # of using llvm_pkg_setup. - if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - fi python-any-r1_pkg_setup if ! use libcxxabi && ! tc-is-gcc ; then @@ -79,6 +73,8 @@ test_compiler() { } src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + # note: we need to do this before multilib kicks in since it will # alter the CHOST local cxxabi cxxabi_incs