commit: 9aebeb308121be31f75fb646cc0de1facd2e9401
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 17 16:26:32 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 17 16:29:12 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aebeb30
llvm-runtimes/libcxxabi: Revert "Support cross build"
Reverts: 56e6e9080dbc3bc97bdf34bb29bda2be92596f44
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
llvm-runtimes/libcxxabi/libcxxabi-19.1.7-r1.ebuild | 123 ---------------------
llvm-runtimes/libcxxabi/libcxxabi-20.1.0.ebuild | 22 +---
.../libcxxabi/libcxxabi-21.0.0.9999.ebuild | 22 +---
3 files changed, 10 insertions(+), 157 deletions(-)
diff --git a/llvm-runtimes/libcxxabi/libcxxabi-19.1.7-r1.ebuild
b/llvm-runtimes/libcxxabi/libcxxabi-19.1.7-r1.ebuild
deleted file mode 100644
index 427d46554b23..000000000000
--- a/llvm-runtimes/libcxxabi/libcxxabi-19.1.7-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake-multilib crossdev flag-o-matic llvm.org llvm-utils
-inherit python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
-IUSE="+clang +static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
- !<llvm-runtimes/libcxx-15
-"
-DEPEND="
- ${RDEPEND}
- llvm-core/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
- clang? (
- llvm-core/clang:${LLVM_MAJOR}
- )
- !test? (
- ${PYTHON_DEPS}
- )
- test? (
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
- )
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
- use test || return 0
- python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
- llvm_prepend_path "${LLVM_MAJOR}"
-
- if use clang; then
- local -x CC=${CTARGET}-clang
- local -x CXX=${CTARGET}-clang++
- strip-unsupported-flags
- fi
-
- # link to compiler-rt
- local use_compiler_rt=OFF
- [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
- local install_prefix=${EPREFIX}
- target_is_not_host && install_prefix+=/usr/${CTARGET}
-
- local libdir=$(get_libdir)
- local mycmakeargs=(
- -DCMAKE_CXX_COMPILER_TARGET="${CTARGET}"
- -DCMAKE_INSTALL_PREFIX="${install_prefix}/usr"
- -DPython3_EXECUTABLE="${PYTHON}"
- -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
- -DLLVM_INCLUDE_TESTS=OFF
- -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
- -DLIBCXXABI_ENABLE_SHARED=ON
- -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
- -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
- -DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
- # upstream is omitting standard search path for this
- # probably because gcc & clang are bundling their own unwind.h
- -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
- # this is broken with standalone builds, and also meaningless
- -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-
- -DLIBCXX_LIBDIR_SUFFIX=
- -DLIBCXX_ENABLE_SHARED=ON
- -DLIBCXX_ENABLE_STATIC=OFF
- -DLIBCXX_CXX_ABI=libcxxabi
- -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
- -DLIBCXX_HAS_MUSL_LIBC=$(llvm_cmake_use_musl)
- -DLIBCXX_HAS_GCC_S_LIB=OFF
- -DLIBCXX_INCLUDE_BENCHMARKS=OFF
- -DLIBCXX_INCLUDE_TESTS=OFF
- )
- if is_crosspkg; then
- mycmakeargs+=(
- # Without this, the compiler will compile a test program
- # and fail due to no builtins.
- -DCMAKE_C_COMPILER_WORKS=1
- -DCMAKE_CXX_COMPILER_WORKS=1
- )
- fi
- if use test; then
- mycmakeargs+=(
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="$(get_lit_flags)"
- -DPython3_EXECUTABLE="${PYTHON}"
- )
- fi
- cmake_src_configure
-}
-
-multilib_src_compile() {
- cmake_build cxxabi
-}
-
-multilib_src_test() {
- local -x LIT_PRESERVES_TMP=1
- cmake_build check-cxxabi
-}
-
-multilib_src_install() {
- DESTDIR="${D}" cmake_build install-cxxabi
-}
diff --git a/llvm-runtimes/libcxxabi/libcxxabi-20.1.0.ebuild
b/llvm-runtimes/libcxxabi/libcxxabi-20.1.0.ebuild
index 54cc68b1af0f..5ebe26d49210 100644
--- a/llvm-runtimes/libcxxabi/libcxxabi-20.1.0.ebuild
+++ b/llvm-runtimes/libcxxabi/libcxxabi-20.1.0.ebuild
@@ -4,8 +4,8 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake-multilib crossdev flag-o-matic llvm.org llvm-utils
-inherit 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/";
@@ -50,8 +50,8 @@ multilib_src_configure() {
llvm_prepend_path "${LLVM_MAJOR}"
if use clang; then
- local -x CC=${CTARGET}-clang
- local -x CXX=${CTARGET}-clang++
+ local -x CC=${CHOST}-clang
+ local -x CXX=${CHOST}-clang++
strip-unsupported-flags
fi
@@ -59,13 +59,9 @@ multilib_src_configure() {
local use_compiler_rt=OFF
[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
- local install_prefix=${EPREFIX}
- target_is_not_host && install_prefix+=/usr/${CTARGET}
-
local libdir=$(get_libdir)
local mycmakeargs=(
- -DCMAKE_CXX_COMPILER_TARGET="${CTARGET}"
- -DCMAKE_INSTALL_PREFIX="${install_prefix}/usr"
+ -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-DPython3_EXECUTABLE="${PYTHON}"
-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-DLLVM_INCLUDE_TESTS=OFF
@@ -90,14 +86,6 @@ multilib_src_configure() {
-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-DLIBCXX_INCLUDE_TESTS=OFF
)
- if is_crosspkg; then
- mycmakeargs+=(
- # Without this, the compiler will compile a test program
- # and fail due to no builtins.
- -DCMAKE_C_COMPILER_WORKS=1
- -DCMAKE_CXX_COMPILER_WORKS=1
- )
- fi
if use test; then
mycmakeargs+=(
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
diff --git a/llvm-runtimes/libcxxabi/libcxxabi-21.0.0.9999.ebuild
b/llvm-runtimes/libcxxabi/libcxxabi-21.0.0.9999.ebuild
index eae7c454f905..7aab2f168c62 100644
--- a/llvm-runtimes/libcxxabi/libcxxabi-21.0.0.9999.ebuild
+++ b/llvm-runtimes/libcxxabi/libcxxabi-21.0.0.9999.ebuild
@@ -4,8 +4,8 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake-multilib crossdev flag-o-matic llvm.org llvm-utils
-inherit 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/";
@@ -49,8 +49,8 @@ multilib_src_configure() {
llvm_prepend_path "${LLVM_MAJOR}"
if use clang; then
- local -x CC=${CTARGET}-clang
- local -x CXX=${CTARGET}-clang++
+ local -x CC=${CHOST}-clang
+ local -x CXX=${CHOST}-clang++
strip-unsupported-flags
fi
@@ -58,13 +58,9 @@ multilib_src_configure() {
local use_compiler_rt=OFF
[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
- local install_prefix=${EPREFIX}
- target_is_not_host && install_prefix+=/usr/${CTARGET}
-
local libdir=$(get_libdir)
local mycmakeargs=(
- -DCMAKE_CXX_COMPILER_TARGET="${CTARGET}"
- -DCMAKE_INSTALL_PREFIX="${install_prefix}/usr"
+ -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-DPython3_EXECUTABLE="${PYTHON}"
-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-DLLVM_INCLUDE_TESTS=OFF
@@ -89,14 +85,6 @@ multilib_src_configure() {
-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-DLIBCXX_INCLUDE_TESTS=OFF
)
- if is_crosspkg; then
- mycmakeargs+=(
- # Without this, the compiler will compile a test program
- # and fail due to no builtins.
- -DCMAKE_C_COMPILER_WORKS=1
- -DCMAKE_CXX_COMPILER_WORKS=1
- )
- fi
if use test; then
mycmakeargs+=(
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
