diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2024-02-10 12:04:49 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2024-02-10 12:13:09 +0100 |
| commit | d8ba52c577a8361f0e734b65328165c1036eed8e (patch) | |
| tree | 0d481e120f9e264dc32d2d34db54a73aef099080 /sys-libs | |
| parent | sys-libs/llvm-libunwind: Migrate to llvm-utils (diff) | |
| download | gentoo-d8ba52c577a8361f0e734b65328165c1036eed8e.tar.gz gentoo-d8ba52c577a8361f0e734b65328165c1036eed8e.tar.bz2 gentoo-d8ba52c577a8361f0e734b65328165c1036eed8e.zip | |
sys-libs/libcxxabi: Migrate to llvm-utils
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/libcxxabi/libcxxabi-18.1.0_rc2.ebuild | 15 | ||||
| -rw-r--r-- | sys-libs/libcxxabi/libcxxabi-19.0.0.9999.ebuild | 15 | ||||
| -rw-r--r-- | sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240203.ebuild | 15 |
3 files changed, 12 insertions, 33 deletions
diff --git a/sys-libs/libcxxabi/libcxxabi-18.1.0_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-18.1.0_rc2.ebuild index 2c496689828b..d45de5993114 100644 --- a/sys-libs/libcxxabi/libcxxabi-18.1.0_rc2.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-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="Low level support for a standard C++ library" HOMEPAGE="https://libcxxabi.llvm.org/" @@ -45,16 +45,9 @@ python_check_deps() { python_has_version "dev-python/lit[${PYTHON_USEDEP}]" } -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 -} - multilib_src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ diff --git a/sys-libs/libcxxabi/libcxxabi-19.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-19.0.0.9999.ebuild index 2c496689828b..d45de5993114 100644 --- a/sys-libs/libcxxabi/libcxxabi-19.0.0.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-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="Low level support for a standard C++ library" HOMEPAGE="https://libcxxabi.llvm.org/" @@ -45,16 +45,9 @@ python_check_deps() { python_has_version "dev-python/lit[${PYTHON_USEDEP}]" } -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 -} - multilib_src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ diff --git a/sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240203.ebuild b/sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240203.ebuild index 2c496689828b..d45de5993114 100644 --- a/sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240203.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-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="Low level support for a standard C++ library" HOMEPAGE="https://libcxxabi.llvm.org/" @@ -45,16 +45,9 @@ python_check_deps() { python_has_version "dev-python/lit[${PYTHON_USEDEP}]" } -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 -} - multilib_src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ |