commit:     7229fdad16650e2938150d5ff09c6de1374840ff
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 24 02:25:20 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 24 02:25:20 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7229fdad

llvm-runtimes/libcxx: Add 22.0.0_pre20250923 snapshot

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

 llvm-runtimes/libcxx/Manifest                      |   1 +
 .../libcxx/libcxx-22.0.0_pre20250923.ebuild        | 260 +++++++++++++++++++++
 2 files changed, 261 insertions(+)

diff --git a/llvm-runtimes/libcxx/Manifest b/llvm-runtimes/libcxx/Manifest
index 33dd92abb66b..03dae8d52895 100644
--- a/llvm-runtimes/libcxx/Manifest
+++ b/llvm-runtimes/libcxx/Manifest
@@ -14,4 +14,5 @@ DIST llvm-project-20.1.8.src.tar.xz 147242952 BLAKE2B 
7657ac0b26acc5affb1bfc91b9
 DIST llvm-project-20.1.8.src.tar.xz.sig 566 BLAKE2B 
85beedfcff1195a974fab2c667b9efd4b715b3480c1b44b1b887fe32c69f72aca0d3b8fb276c03b6cc5a866622f669047aeee5ccb976640b4008ccd31dce77a4
 SHA512 
d74369bdb4d1b82775161ea53c9c5f3a23ce810f4df5ff617123023f9d8ce720e7d6ecc9e17f8ebd39fd9e7a9de79560abdf2ffe73bcb907a43148d43665d619
 DIST llvm-project-21.1.1.src.tar.xz 158891056 BLAKE2B 
5801ba4ea64e9c55fd1e6a83e1ea463cfb1d2b12c1f25a488ca63fd88254f20388c5e986492e413d795306bc37782487b80485240939227f3beeea860091825c
 SHA512 
a120895e75942d848cc763fd1cb4aeb184e9d4509d69064e8e3f5679fbeb09c73bf916e33d04b842778537d2331067ec9190e0ad75d591d3ba57871770e19bce
 DIST llvm-project-21.1.1.src.tar.xz.sig 438 BLAKE2B 
8fdf614e67e31382c65d70a551ef94893b8e4914e855fa96fc3a4a0a4ac916d646758be1c1c9a74028acd776d5d93b77f678d29dc75179ae95909d525d263c85
 SHA512 
1b9a2c51feaca75ef2f82a89c8e8d741a0b5f05f0dd8ca244d6997deb00f8ded3c37a5cbc6012a4ba8632004383ab4677756d9defe8855fff458e02380d77bd5
+DIST llvm-project-70bd610e43853d575e22be1cda46614fe9f0072f.tar.gz 247904536 
BLAKE2B 
f0ae7bd39d921ce28adb6e2aadd8b2b94ba7a48ba344ea6ea236b2507430fb1a0e23cd6186d79d445de31d46580e2ac9ec400fc686cd9a7513e0ae2d0f479c1d
 SHA512 
1201acbcec20d00979e7f06075756926161123cfb11da146a3bfa5c81d607b61d94c645d0abba839614cbe5d44cacb0b1c754e1ae49fa871cb86d9f6d7c70e26
 DIST llvm-project-f059d2bac034acca39ad60a1b13aaec6afa0a3d6.tar.gz 248627883 
BLAKE2B 
e1603ba38fcf70e7f3794a30a42057d0052a422bd0aaf423c65d1fd8f9ec7d3981cd651f309dc3ab5c28183291241732373b9bdb75fc2a11fc8d9f238388b8c3
 SHA512 
63a1627a8b3cc8f240cefe2066d7e306cab5091317f97dd808b9ad887d4e6eb2d21af3f79bccfdb9387f5f7a5ed0b772013b0261a647c8d50ffaa55914362dfb

diff --git a/llvm-runtimes/libcxx/libcxx-22.0.0_pre20250923.ebuild 
b/llvm-runtimes/libcxx/libcxx-22.0.0_pre20250923.ebuild
new file mode 100644
index 000000000000..9825200fd784
--- /dev/null
+++ b/llvm-runtimes/libcxx/libcxx-22.0.0_pre20250923.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+inherit cmake-multilib crossdev flag-o-matic llvm.org llvm-utils
+inherit python-any-r1 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"
+IUSE="+clang +libcxxabi +static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       libcxxabi? (
+               ~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+       )
+       !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+DEPEND="
+       ${RDEPEND}
+       llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+       clang? (
+               llvm-core/clang:${LLVM_MAJOR}
+               llvm-core/clang-linker-config:${LLVM_MAJOR}
+               llvm-runtimes/clang-rtlib-config:${LLVM_MAJOR}
+               llvm-runtimes/clang-unwindlib-config:${LLVM_MAJOR}
+       )
+       !test? (
+               ${PYTHON_DEPS}
+       )
+       test? (
+               dev-debug/gdb[python]
+               $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+       )
+"
+
+LLVM_COMPONENTS=(
+       runtimes libcxx{,abi} libc 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
+}
+
+test_compiler() {
+       $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+               <<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+       local install_prefix=${EPREFIX}
+       is_crosspkg && install_prefix+=/usr/${CTARGET}
+
+       # 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="${install_prefix}/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() {
+       # Workaround for bgo #961153.
+       # TODO: Fix the multilib.eclass, so it sets CTARGET properly.
+       if ! is_crosspkg; then
+               export CTARGET=${CHOST}
+       fi
+
+       if use clang; then
+               llvm_prepend_path -b "${LLVM_MAJOR}"
+               local -x CC=${CTARGET}-clang-${LLVM_MAJOR}
+               local -x CXX=${CTARGET}-clang++-${LLVM_MAJOR}
+               strip-unsupported-flags
+
+               # The full clang configuration might not be ready yet. Use the 
partial
+               # configuration of components that libunwind depends on.
+               local flags=(
+                       
--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-{rtlib,unwindlib,linker}.cfg
+               )
+               local -x CFLAGS="${CFLAGS} ${flags[@]}"
+               local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
+               local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
+       fi
+
+       # link to compiler-rt
+       local use_compiler_rt=OFF
+       [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+       local nostdlib_flags=( -nostdlib++ )
+       if ! test_compiler && test_compiler "${nostdlib_flags[@]}"; then
+               local -x LDFLAGS="${LDFLAGS} ${nort_flags[*]}"
+               ewarn "${CXX} seems to lack runtime, trying with 
${nort_flags[*]}"
+       fi
+
+       local libdir=$(get_libdir)
+       local mycmakeargs=(
+               -DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+               -DCMAKE_CXX_COMPILER_TARGET="${CTARGET}"
+               -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=$(llvm_cmake_use_musl)
+               -DLIBCXX_INCLUDE_BENCHMARKS=OFF
+               -DLIBCXX_INCLUDE_TESTS=$(usex test)
+               -DLIBCXX_INSTALL_MODULES=ON
+               -DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
+               # this is broken with standalone builds, and also meaningless
+               -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+       )
+       if is_crosspkg; then
+               # Needed to target built libc headers
+               local -x CFLAGS="${CFLAGS} -isystem 
${ESYSROOT}/usr/${CTARGET}/usr/include"
+               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
+                       # Install inside the cross sysroot.
+                       -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/${CTARGET}/usr"
+               )
+       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_src_compile
+       if [[ ${CHOST} != *-darwin* ]] ; then
+               local libdir=$(get_libdir)
+               gen_shared_ldscript
+               use static-libs && gen_static_ldscript
+       fi
+}
+
+multilib_src_test() {
+       local -x LIT_PRESERVES_TMP=1
+       # https://github.com/llvm/llvm-project/issues/153940
+       local -x LIT_XFAIL="libcxx/gdb/gdb_pretty_printer_test.sh.cpp"
+       cmake_build install-cxx-test-suite-prefix
+       if [[ ${CHOST} != *-darwin* ]] ; then
+               local libdir=$(get_libdir)
+               cp 
"${BUILD_DIR}"/{,libcxx/test-suite-install/}"${libdir}"/libc++_shared.so || die
+               if use static-libs; then
+                       cp 
"${BUILD_DIR}"/{,libcxx/test-suite-install/}"${libdir}"/libc++_static.a || die
+               fi
+       fi
+       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
+               local libdir=$(get_libdir)
+               is_crosspkg && into /usr/${CTARGET}
+               dolib.so "${libdir}"/libc++_shared.so
+               use static-libs && dolib.a "${libdir}"/libc++_static.a
+       fi
+
+       local install_prefix=
+       is_crosspkg && install_prefix=/usr/${CTARGET}
+       insinto "${install_prefix}/usr/share/libc++/gdb"
+       doins ../libcxx/utils/gdb/libcxx/printers.py
+
+       local lib_version=$(sed -n -e 's/^LIBCXX_LIBRARY_VERSION:STRING=//p' 
CMakeCache.txt || die)
+       [[ -n ${lib_version} ]] || die "Could not determine 
LIBCXX_LIBRARY_VERSION from CMakeCache.txt"
+
+       insinto "${install_prefix}/usr/share/gdb/auto-load/usr/$(get_libdir)"
+       newins - "libc++.so.${lib_version}-gdb.py" <<-EOF
+               __import__("sys").path.insert(0, 
"${EPREFIX}/usr/share/libc++/gdb")
+               __import__("printers").register_libcxx_printer_loader()
+       EOF
+}
+
+# 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 "${libdir}"/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[*]}" > "${libdir}"/libc++.a || die
+}
+
+gen_shared_ldscript() {
+       # Move it first.
+       mv "${libdir}"/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[*]}" > "${libdir}"/libc++.so || die
+}

Reply via email to