commit:     520fba43cce42fc16532863c5e7c36b22e19dd58
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 06:36:33 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 12:50:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520fba43

sys-libs/libcxx: Add 18.1.2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-libs/libcxx/Manifest             |   2 +
 sys-libs/libcxx/libcxx-18.1.2.ebuild | 210 +++++++++++++++++++++++++++++++++++
 2 files changed, 212 insertions(+)

diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index d8ae43cd6a4d..3fe94ea4a361 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -8,6 +8,8 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B 
d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 
186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7
 SHA512 
f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.0.src.tar.xz 132034208 BLAKE2B 
06ad7c65e1d10946c74027ec46c46f9b78fe764dc6c45e016b3d39006dac40af4cae2e01d07131785711913f311d944e9817036b20b08366382e83f3d4093814
 SHA512 
b94f837ff0e1aafdd4939e6e50740c8ab6af602b182357ae495359301a6d5fadaa997014895b90e0c91a715c713218396bb10687167ef30b17ebeccf310f2adf
 DIST llvm-project-18.1.0.src.tar.xz.sig 566 BLAKE2B 
1ab731c3fb151ce777ad4e2c8c653e5e08c2e97795dae06185d9d92248d4435aae67e1cfa23efb9b0b90ee44183ca69b92c64cb2b6d2c338388bde1fea07d232
 SHA512 
7bda930945c4b51c33de9918941797a4336020b475f3999a81055bb0b2a080f81e823c6bde43cc445a113e78f5667939bce5da64ccd650e8e9b15646f84ae105
+DIST llvm-project-18.1.2.src.tar.xz 132060436 BLAKE2B 
f21fca02fe9e02a3d440595aafbe0572be318ce69cc6285c1bf3dc9187b37ebf4c76f3ea60b6870c441675288f46e5597b069ec451d5026c5161f84daef6b4b2
 SHA512 
a0d01b018abbdf1609abc7b63911bb4c6c3619b748a0616b66be0843fcaa4240868412c5d1f77fe6dafdfed665b46570e7ce615da58efcaa91e9ddc8481e6fc4
+DIST llvm-project-18.1.2.src.tar.xz.sig 566 BLAKE2B 
97c6b6b4a041316e70abd54ff715d87a62410fe5590c9b90548fff5a5121d8d5e028ec681f7e99c130d6c6726835365825286ef0a01c82a98394d9369ea7a390
 SHA512 
1cd8d1c227782cb43e269696045cea500a43f3c6b786f2cda8d380f5b8fc28d3ada11c41c4a252f2d3db465f767b27ea50c5659faa43d4aa5655cc3ffd6243c2
 DIST llvm-project-1c7607e8ee6ec4ca3abce1561dd39a98d4efac96.tar.gz 207112414 
BLAKE2B 
eb028b0b09d0f970d2861578245f4ace7ebe55ef1da33503cad6a1ed3691d29cac2556bc9360e911d64ab617df4cce0d26ea0e1ab49a68ce7e4001c52ed32a71
 SHA512 
687720278900dd57dae430e965902777946e93b647726410c6310bb1c2c944d7d30d1733204d3db10d527ecff9d9ad78cbcb8a97408383d9c5245a031291674a
 DIST llvm-project-597f9761c3a5ba278fa930d2fac13f156287d505.tar.gz 206699707 
BLAKE2B 
5461426f02742cefe5ae7faeb7fed15628741e3fb41ca01ffb8159805f9b55d883d318e7c677e5bf348949b7d8e16e079df09d461abe9b32d804dcb284584fc5
 SHA512 
b06ae070bb197d18cb8653e290b85e8526cdab4aeb5a02c94295d489d271bd7cea637960b516937e0ba1d7ada29e734c8ea1137335d46756db54632dcdba93e9
 DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 
BLAKE2B 
855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82
 SHA512 
ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490

diff --git a/sys-libs/libcxx/libcxx-18.1.2.ebuild 
b/sys-libs/libcxx/libcxx-18.1.2.ebuild
new file mode 100644
index 000000000000..a6fca47e6c29
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-18.1.2.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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/";
+
+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 +libcxxabi +static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       libcxxabi? (
+               ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+       )
+       !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+DEPEND="
+       ${RDEPEND}
+       sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+       clang? (
+               sys-devel/clang:${LLVM_MAJOR}
+       )
+       !test? (
+               ${PYTHON_DEPS}
+       )
+       test? (
+               dev-debug/gdb[python]
+               $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+       )
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+       use test || return 0
+       python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+       python-any-r1_pkg_setup
+
+       if ! use libcxxabi && ! tc-is-gcc ; then
+               eerror "To build ${PN} against libsupc++, you have to use gcc. 
Other"
+               eerror "compilers are not supported. Please set CC=gcc and 
CXX=g++"
+               eerror "and try again."
+               die
+       fi
+}
+
+src_prepare() {
+       # hanging tests
+       # https://github.com/llvm/llvm-project/issues/73791
+       rm 
../libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/fetch_* || 
die
+       rm 
../libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/operator.*_equals*
 || die
+
+       cmake_src_prepare
+}
+
+test_compiler() {
+       $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+               <<<'int main() { return 0; }' &>/dev/null
+}
+
+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
+       if use libcxxabi; then
+               cxxabi=system-libcxxabi
+               cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
+       else
+               local 
gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+               cxxabi=libsupc++
+               cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+       fi
+
+       multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+       if use clang; then
+               local -x CC=${CHOST}-clang
+               local -x CXX=${CHOST}-clang++
+               strip-unsupported-flags
+       fi
+
+       # link to compiler-rt
+       local use_compiler_rt=OFF
+       [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+       # bootstrap: cmake is unhappy if compiler can't link to stdlib
+       local nolib_flags=( -nodefaultlibs -lc )
+       if ! test_compiler; then
+               if test_compiler "${nolib_flags[@]}"; then
+                       local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+                       ewarn "${CXX} seems to lack runtime, trying with 
${nolib_flags[*]}"
+               fi
+       fi
+
+       local libdir=$(get_libdir)
+       local mycmakeargs=(
+               -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+               -DPython3_EXECUTABLE="${PYTHON}"
+               -DLLVM_ENABLE_RUNTIMES=libcxx
+               -DLLVM_INCLUDE_TESTS=OFF
+               -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+               -DLIBCXX_ENABLE_SHARED=ON
+               -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+               -DLIBCXX_CXX_ABI=${cxxabi}
+               -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+               # we're using our own mechanism for generating linker scripts
+               -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+               -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+               -DLIBCXX_INCLUDE_BENCHMARKS=OFF
+               -DLIBCXX_INCLUDE_TESTS=$(usex test)
+               -DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
+               # this is broken with standalone builds, and also meaningless
+               -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+       )
+
+       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_src_compile
+       if [[ ${CHOST} != *-darwin* ]] ; then
+               gen_shared_ldscript
+               use static-libs && gen_static_ldscript
+       fi
+}
+
+multilib_src_test() {
+       local -x LIT_PRESERVES_TMP=1
+       cmake_build check-cxx
+}
+
+multilib_src_install() {
+       cmake_src_install
+       # since we've replaced libc++.{a,so} with ldscripts, now we have to
+       # install the extra symlinks
+       if [[ ${CHOST} != *-darwin* ]] ; then
+               dolib.so lib/libc++_shared.so
+               use static-libs && dolib.a lib/libc++_static.a
+       fi
+}
+
+# Usage: deps
+gen_ldscript() {
+       local output_format
+       output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | 
sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+       [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( 
${output_format} )"
+
+       cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+       # Move it first.
+       mv lib/libc++{,_static}.a || die
+       # Generate libc++.a ldscript for inclusion of its dependencies so that
+       # clang++ -stdlib=libc++ -static works out of the box.
+       local deps=(
+               libc++_static.a
+               $(usex libcxxabi libc++abi.a libsupc++.a)
+       )
+       # On Linux/glibc it does not link without libpthread or libdl. It is
+       # fine on FreeBSD.
+       use elibc_glibc && deps+=( libpthread.a libdl.a )
+
+       gen_ldscript "${deps[*]}" > lib/libc++.a || die
+}
+
+gen_shared_ldscript() {
+       # Move it first.
+       mv lib/libc++{,_shared}.so || die
+       local deps=(
+               libc++_shared.so
+               # libsupc++ doesn't have a shared version
+               $(usex libcxxabi libc++abi.so libsupc++.a)
+       )
+
+       gen_ldscript "${deps[*]}" > lib/libc++.so || die
+}

Reply via email to