commit:     ccb55ace0a55794a4408c25f954d193dc4dbdba8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 15 07:15:18 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 15 07:21:15 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb55ace

llvm-runtimes/compiler-rt-sanitizers: Remove old

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

 llvm-runtimes/compiler-rt-sanitizers/Manifest      |   4 -
 .../compiler-rt-sanitizers-21.1.4.ebuild           | 237 ---------------------
 ...ompiler-rt-sanitizers-22.0.0_pre20251028.ebuild | 237 ---------------------
 ...ompiler-rt-sanitizers-22.0.0_pre20251101.ebuild | 237 ---------------------
 4 files changed, 715 deletions(-)

diff --git a/llvm-runtimes/compiler-rt-sanitizers/Manifest 
b/llvm-runtimes/compiler-rt-sanitizers/Manifest
index 3457f07e99dc..10b71307d3b5 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/Manifest
+++ b/llvm-runtimes/compiler-rt-sanitizers/Manifest
@@ -17,9 +17,5 @@ DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 
1259ed7f9aca7b35e89d818bef
 DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 
4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd
 SHA512 
195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
 DIST llvm-project-20.1.8.src.tar.xz 147242952 BLAKE2B 
7657ac0b26acc5affb1bfc91b912ade3191c5d77f3979d5a80d5f6ce52f56a7d1c448bd257398390bf10838f02faa6f3ece37a7327cced69d165ec2e2e699316
 SHA512 
f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
 DIST llvm-project-20.1.8.src.tar.xz.sig 566 BLAKE2B 
85beedfcff1195a974fab2c667b9efd4b715b3480c1b44b1b887fe32c69f72aca0d3b8fb276c03b6cc5a866622f669047aeee5ccb976640b4008ccd31dce77a4
 SHA512 
d74369bdb4d1b82775161ea53c9c5f3a23ce810f4df5ff617123023f9d8ce720e7d6ecc9e17f8ebd39fd9e7a9de79560abdf2ffe73bcb907a43148d43665d619
-DIST llvm-project-21.1.4.src.tar.xz 158939036 BLAKE2B 
b87eff4e3cb881d86aafcfdb46d85344ad6ae92d5c1e72c05282f375b4b11844756d0e6b4d0da5e522a348170a5da9842917737e272b758d8dde7e1fb2bee135
 SHA512 
a8c0883abe7c5a3e55ca7ed0fd974fae4351184a0b0df18295a982ca8ddb0f8d167353564204ed00f0cd9a1d8baef7074c0b39a99e0b5c52ced6bbee73dde3da
-DIST llvm-project-21.1.4.src.tar.xz.sig 119 BLAKE2B 
c74a56448ad3e325234fcbe7d62ea888831e1e7696afb5aa5a185ea76a0880abe2d755f9e69a07760bbf9380534c3bb96c920ed6359ffd0f5f51c962d1494dcf
 SHA512 
4812c2e3861aa3b726d842c3ca259b19ef1aa531fed9f6f47099483de91de2b2a165f40d243f6f40f2eea749741d5f8b7090f394399c56db02053f308921077a
 DIST llvm-project-21.1.5.src.tar.xz 158957032 BLAKE2B 
c056049214b18a17a3fd2dc86ae82121a821841002b8386b1fe35fc34f1f0faeb681f39880814e4a47f976b2744bfd2c4f1316156469c6b6a79c013d200dab30
 SHA512 
865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
 DIST llvm-project-21.1.5.src.tar.xz.sig 119 BLAKE2B 
abf014908e981ea358ee38f6d1ef6c745ebbe51011fa7e83a514672bbad152fac92c95dd32a7b52a8d9c2a2a9ea1b44e447bb0bc5953f0f7bbd9ced34aa3c0cc
 SHA512 
4e327c7d60525526ff3ac6ca58f1e753a57f841b88078a9bfe2a2ce91e4a5e17bcc52fd2f27f75801540610c1a56d57a3070243f13ad583e3526901b1f7be4a5
-DIST llvm-project-7631c73850bec991ec9a7c9cca58c275bb0277a4.tar.gz 253713417 
BLAKE2B 
0126bdf53ffb57ca0fa471c01deb4f0a9f824083c332f72e14ea7dc843cf80e7360aa0bcd8eff22f42f993db2b077c696c25232c1a9d98cfa865d98569398b55
 SHA512 
58488afe3eb7865f171ac5f692a8c1252bf3d049420a72e72581e5024066b2a4ba2dbfa5c9f06de799ad3e04949997e61c60ee0f89aa6a8642b6d9263c78a144
-DIST llvm-project-c1779f33bdada6e478e882cc23a647ef9abaad96.tar.gz 253250521 
BLAKE2B 
fbd40cb52d56d5a817ff6cb469b9772af4eb358584eed1440c82864923add456961a672784838f510c390680a54c4abc7a33159848a34133f8d23b80b5feb0ef
 SHA512 
01f8944ee6c89fd4a56caab236b302bc6b49b933c968a73edcb00ae2522b884371a05a75dec1321b0efed24e20cde4a58e1697c3c097f26ed0fbd629d8cf561c

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.4.ebuild 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.4.ebuild
deleted file mode 100644
index bfe432ebdae7..000000000000
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.4.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux 
~ppc-macos ~x64-macos"
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-# base targets
-IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-       asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-       shadowcallstack gwp-asan nsan rtsan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-       || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-       test? (
-               cfi? ( ubsan )
-               gwp-asan? ( scudo )
-       )
-"
-RESTRICT="
-       !clang? ( test )
-       !test? ( test )
-"
-
-DEPEND="
-       llvm-core/llvm:${LLVM_MAJOR}
-       virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-       clang? (
-               llvm-core/clang:${LLVM_MAJOR}
-               llvm-core/clang-linker-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-rtlib-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-stdlib-config:${LLVM_MAJOR}
-               llvm-runtimes/compiler-rt:${LLVM_MAJOR}
-       )
-       elibc_glibc? ( net-libs/libtirpc )
-       test? (
-               $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-       )
-       !test? (
-               ${PYTHON_DEPS}
-       )
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=(
-       llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
-)
-llvm.org_set_globals
-
-python_check_deps() {
-       use test || return 0
-       python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-       if use test; then
-               local CHECKREQS_DISK_BUILD=11G
-               check-reqs_pkg_pretend
-       fi
-}
-
-pkg_pretend() {
-       check_space
-}
-
-pkg_setup() {
-       check_space
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-       local flag
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if ! use "${flag}"; then
-                       local cmake_flag=${flag/-/_}
-                       sed -i -e 
"/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-                               cmake/config-ix.cmake || die
-               fi
-       done
-
-       # TODO: fix these tests to be skipped upstream
-       if use asan && ! use profile; then
-               rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-       fi
-       if use ubsan && ! use cfi; then
-               > test/cfi/CMakeLists.txt || die
-       fi
-       # hangs, sigh
-       rm test/tsan/getline_nohang.cpp || die
-
-       llvm.org_src_prepare
-}
-
-src_configure() {
-       llvm_prepend_path "${LLVM_MAJOR}"
-
-       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-       # pre-set since we need to pass it to cmake
-       BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-       if use clang; then
-               local -x CC=${CHOST}-clang-${LLVM_MAJOR}
-               local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
-               strip-unsupported-flags
-
-               # The full clang configuration might not be ready yet. Use the 
partial
-               # configuration files that are guaranteed to exist even during 
initial
-               # installations and upgrades.
-               local flags=(
-                       
--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-{rtlib,stdlib,linker}.cfg
-               )
-               local -x CFLAGS="${CFLAGS} ${flags[@]}"
-               local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
-               local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
-       fi
-
-       local flag want_sanitizer=OFF
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if use "${flag}"; then
-                       want_sanitizer=ON
-                       break
-               fi
-       done
-
-       local mycmakeargs=(
-               
-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-               # use a build dir structure consistent with install
-               # this makes it possible to easily deploy test-friendly clang
-               -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-               -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-               # builtins & crt installed by llvm-runtimes/compiler-rt
-               -DCOMPILER_RT_BUILD_BUILTINS=OFF
-               -DCOMPILER_RT_BUILD_CRT=OFF
-               -DCOMPILER_RT_BUILD_CTX_PROFILE=$(usex ctx-profile)
-               -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-               -DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-               -DCOMPILER_RT_BUILD_ORC=$(usex orc)
-               -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-               -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-               -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-               -DPython3_EXECUTABLE="${PYTHON}"
-       )
-
-       if use amd64; then
-               mycmakeargs+=(
-                       -DCAN_TARGET_i386=$(usex abi_x86_32)
-                       -DCAN_TARGET_x86_64=$(usex abi_x86_64)
-               )
-       fi
-
-       if use test; then
-               mycmakeargs+=(
-                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-                       # they are created during src_test()
-                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-               )
-
-               # same flags are passed for build & tests, so we need to strip
-               # them down to a subset supported by clang
-               CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-               strip-unsupported-flags
-       fi
-
-       if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-               mycmakeargs+=(
-                       # setting -isysroot is disabled with 
compiler-rt-prefix-paths.patch
-                       # this allows adding arm64 support using SDK in EPREFIX
-                       -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-                       # Set version based on the SDK in EPREFIX
-                       # This disables i386 for SDK >= 10.15
-                       # Will error if has_use tsan and SDK < 10.12
-                       -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath 
"${EPREFIX}/MacOSX.sdk" | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-                       # Use our libtool instead of looking it up with xcrun
-                       -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-               )
-       fi
-
-       cmake_src_configure
-
-       if use test; then
-               local sys_dest=( "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/lib/* )
-               [[ ! -e ${sys_dest} ]] && die "Unable to find ${sys_dest}"
-               [[ ${#sys_dest[@]} -ne 1 ]] && die "Non-deterministic 
compiler-rt install: ${sys_dest[*]}"
-               local sys_dir=( 
"${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}/lib/${sys_dest##*/}" )
-               [[ ! -e ${sys_dir} ]] && die "${sys_dir} is missing"
-
-               # copy clang over since resource_dir is located relatively to 
binary
-               # therefore, we can put our new libraries in it
-               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include}
 || die
-               cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-                       "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-               cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-                       "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-               cp "${sys_dir}"/*builtins*.a "${sys_dest}/" || die
-               # we also need LLVMgold.so for gold-based tests
-               if [[ -f 
${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-                               
"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-               fi
-       fi
-}
-
-src_test() {
-       # respect TMPDIR!
-       local -x LIT_PRESERVES_TMP=1
-       # disable sandbox to have it stop clobbering LD_PRELOAD
-       local -x SANDBOX_ON=0
-       # wipe LD_PRELOAD to make ASAN happy
-       local -x LD_PRELOAD=
-
-       cmake_build check-all
-}

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20251028.ebuild
 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20251028.ebuild
deleted file mode 100644
index fa3b0d22fd43..000000000000
--- 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20251028.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-# base targets
-IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-       asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-       shadowcallstack gwp-asan nsan rtsan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-       || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-       test? (
-               cfi? ( ubsan )
-               gwp-asan? ( scudo )
-       )
-"
-RESTRICT="
-       !clang? ( test )
-       !test? ( test )
-"
-
-DEPEND="
-       llvm-core/llvm:${LLVM_MAJOR}
-       virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-       clang? (
-               llvm-core/clang:${LLVM_MAJOR}
-               llvm-core/clang-linker-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-rtlib-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-stdlib-config:${LLVM_MAJOR}
-               llvm-runtimes/compiler-rt:${LLVM_MAJOR}
-       )
-       elibc_glibc? ( net-libs/libtirpc )
-       test? (
-               $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-       )
-       !test? (
-               ${PYTHON_DEPS}
-       )
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=(
-       llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
-)
-llvm.org_set_globals
-
-python_check_deps() {
-       use test || return 0
-       python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-       if use test; then
-               local CHECKREQS_DISK_BUILD=11G
-               check-reqs_pkg_pretend
-       fi
-}
-
-pkg_pretend() {
-       check_space
-}
-
-pkg_setup() {
-       check_space
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-       # builds freestanding code
-       filter-flags -fstack-protector*
-
-       local flag
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if ! use "${flag}"; then
-                       local cmake_flag=${flag/-/_}
-                       sed -i -e 
"/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-                               cmake/config-ix.cmake || die
-               fi
-       done
-
-       # TODO: fix these tests to be skipped upstream
-       if use asan && ! use profile; then
-               rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-       fi
-       if use ubsan && ! use cfi; then
-               > test/cfi/CMakeLists.txt || die
-       fi
-
-       llvm.org_src_prepare
-}
-
-src_configure() {
-       llvm_prepend_path "${LLVM_MAJOR}"
-
-       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-       # pre-set since we need to pass it to cmake
-       BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-       if use clang; then
-               local -x CC=${CHOST}-clang-${LLVM_MAJOR}
-               local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
-               strip-unsupported-flags
-
-               # The full clang configuration might not be ready yet. Use the 
partial
-               # configuration files that are guaranteed to exist even during 
initial
-               # installations and upgrades.
-               local flags=(
-                       
--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-{rtlib,stdlib,linker}.cfg
-               )
-               local -x CFLAGS="${CFLAGS} ${flags[@]}"
-               local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
-               local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
-       fi
-
-       local flag want_sanitizer=OFF
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if use "${flag}"; then
-                       want_sanitizer=ON
-                       break
-               fi
-       done
-
-       local mycmakeargs=(
-               
-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-               # use a build dir structure consistent with install
-               # this makes it possible to easily deploy test-friendly clang
-               -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-               -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-               # builtins & crt installed by llvm-runtimes/compiler-rt
-               -DCOMPILER_RT_BUILD_BUILTINS=OFF
-               -DCOMPILER_RT_BUILD_CRT=OFF
-               -DCOMPILER_RT_BUILD_CTX_PROFILE=$(usex ctx-profile)
-               -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-               -DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-               -DCOMPILER_RT_BUILD_ORC=$(usex orc)
-               -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-               -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-               -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-               -DPython3_EXECUTABLE="${PYTHON}"
-       )
-
-       if use amd64; then
-               mycmakeargs+=(
-                       -DCAN_TARGET_i386=$(usex abi_x86_32)
-                       -DCAN_TARGET_x86_64=$(usex abi_x86_64)
-               )
-       fi
-
-       if use test; then
-               mycmakeargs+=(
-                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-                       # they are created during src_test()
-                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-               )
-
-               # same flags are passed for build & tests, so we need to strip
-               # them down to a subset supported by clang
-               CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-               strip-unsupported-flags
-       fi
-
-       if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-               mycmakeargs+=(
-                       # setting -isysroot is disabled with 
compiler-rt-prefix-paths.patch
-                       # this allows adding arm64 support using SDK in EPREFIX
-                       -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-                       # Set version based on the SDK in EPREFIX
-                       # This disables i386 for SDK >= 10.15
-                       # Will error if has_use tsan and SDK < 10.12
-                       -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath 
"${EPREFIX}/MacOSX.sdk" | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-                       # Use our libtool instead of looking it up with xcrun
-                       -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-               )
-       fi
-
-       cmake_src_configure
-
-       if use test; then
-               local sys_dest=( "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/lib/* )
-               [[ ! -e ${sys_dest} ]] && die "Unable to find ${sys_dest}"
-               [[ ${#sys_dest[@]} -ne 1 ]] && die "Non-deterministic 
compiler-rt install: ${sys_dest[*]}"
-               local sys_dir=( 
"${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}/lib/${sys_dest##*/}" )
-               [[ ! -e ${sys_dir} ]] && die "${sys_dir} is missing"
-
-               # copy clang over since resource_dir is located relatively to 
binary
-               # therefore, we can put our new libraries in it
-               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include}
 || die
-               cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-                       "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-               cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-                       "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-               cp "${sys_dir}"/*builtins*.a "${sys_dest}/" || die
-               # we also need LLVMgold.so for gold-based tests
-               if [[ -f 
${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-                               
"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-               fi
-       fi
-}
-
-src_test() {
-       # respect TMPDIR!
-       local -x LIT_PRESERVES_TMP=1
-       # disable sandbox to have it stop clobbering LD_PRELOAD
-       local -x SANDBOX_ON=0
-       # wipe LD_PRELOAD to make ASAN happy
-       local -x LD_PRELOAD=
-
-       cmake_build check-all
-}

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20251101.ebuild
 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20251101.ebuild
deleted file mode 100644
index fa3b0d22fd43..000000000000
--- 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20251101.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-# base targets
-IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-       asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-       shadowcallstack gwp-asan nsan rtsan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-       || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-       test? (
-               cfi? ( ubsan )
-               gwp-asan? ( scudo )
-       )
-"
-RESTRICT="
-       !clang? ( test )
-       !test? ( test )
-"
-
-DEPEND="
-       llvm-core/llvm:${LLVM_MAJOR}
-       virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-       clang? (
-               llvm-core/clang:${LLVM_MAJOR}
-               llvm-core/clang-linker-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-rtlib-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-stdlib-config:${LLVM_MAJOR}
-               llvm-runtimes/compiler-rt:${LLVM_MAJOR}
-       )
-       elibc_glibc? ( net-libs/libtirpc )
-       test? (
-               $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-       )
-       !test? (
-               ${PYTHON_DEPS}
-       )
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=(
-       llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
-)
-llvm.org_set_globals
-
-python_check_deps() {
-       use test || return 0
-       python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-       if use test; then
-               local CHECKREQS_DISK_BUILD=11G
-               check-reqs_pkg_pretend
-       fi
-}
-
-pkg_pretend() {
-       check_space
-}
-
-pkg_setup() {
-       check_space
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-       # builds freestanding code
-       filter-flags -fstack-protector*
-
-       local flag
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if ! use "${flag}"; then
-                       local cmake_flag=${flag/-/_}
-                       sed -i -e 
"/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-                               cmake/config-ix.cmake || die
-               fi
-       done
-
-       # TODO: fix these tests to be skipped upstream
-       if use asan && ! use profile; then
-               rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-       fi
-       if use ubsan && ! use cfi; then
-               > test/cfi/CMakeLists.txt || die
-       fi
-
-       llvm.org_src_prepare
-}
-
-src_configure() {
-       llvm_prepend_path "${LLVM_MAJOR}"
-
-       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-       # pre-set since we need to pass it to cmake
-       BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-       if use clang; then
-               local -x CC=${CHOST}-clang-${LLVM_MAJOR}
-               local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
-               strip-unsupported-flags
-
-               # The full clang configuration might not be ready yet. Use the 
partial
-               # configuration files that are guaranteed to exist even during 
initial
-               # installations and upgrades.
-               local flags=(
-                       
--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-{rtlib,stdlib,linker}.cfg
-               )
-               local -x CFLAGS="${CFLAGS} ${flags[@]}"
-               local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
-               local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
-       fi
-
-       local flag want_sanitizer=OFF
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if use "${flag}"; then
-                       want_sanitizer=ON
-                       break
-               fi
-       done
-
-       local mycmakeargs=(
-               
-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-               # use a build dir structure consistent with install
-               # this makes it possible to easily deploy test-friendly clang
-               -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-               -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-               # builtins & crt installed by llvm-runtimes/compiler-rt
-               -DCOMPILER_RT_BUILD_BUILTINS=OFF
-               -DCOMPILER_RT_BUILD_CRT=OFF
-               -DCOMPILER_RT_BUILD_CTX_PROFILE=$(usex ctx-profile)
-               -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-               -DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-               -DCOMPILER_RT_BUILD_ORC=$(usex orc)
-               -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-               -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-               -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-               -DPython3_EXECUTABLE="${PYTHON}"
-       )
-
-       if use amd64; then
-               mycmakeargs+=(
-                       -DCAN_TARGET_i386=$(usex abi_x86_32)
-                       -DCAN_TARGET_x86_64=$(usex abi_x86_64)
-               )
-       fi
-
-       if use test; then
-               mycmakeargs+=(
-                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-                       # they are created during src_test()
-                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-               )
-
-               # same flags are passed for build & tests, so we need to strip
-               # them down to a subset supported by clang
-               CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-               strip-unsupported-flags
-       fi
-
-       if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-               mycmakeargs+=(
-                       # setting -isysroot is disabled with 
compiler-rt-prefix-paths.patch
-                       # this allows adding arm64 support using SDK in EPREFIX
-                       -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-                       # Set version based on the SDK in EPREFIX
-                       # This disables i386 for SDK >= 10.15
-                       # Will error if has_use tsan and SDK < 10.12
-                       -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath 
"${EPREFIX}/MacOSX.sdk" | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-                       # Use our libtool instead of looking it up with xcrun
-                       -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-               )
-       fi
-
-       cmake_src_configure
-
-       if use test; then
-               local sys_dest=( "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/lib/* )
-               [[ ! -e ${sys_dest} ]] && die "Unable to find ${sys_dest}"
-               [[ ${#sys_dest[@]} -ne 1 ]] && die "Non-deterministic 
compiler-rt install: ${sys_dest[*]}"
-               local sys_dir=( 
"${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}/lib/${sys_dest##*/}" )
-               [[ ! -e ${sys_dir} ]] && die "${sys_dir} is missing"
-
-               # copy clang over since resource_dir is located relatively to 
binary
-               # therefore, we can put our new libraries in it
-               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include}
 || die
-               cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-                       "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-               cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-                       "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-               cp "${sys_dir}"/*builtins*.a "${sys_dest}/" || die
-               # we also need LLVMgold.so for gold-based tests
-               if [[ -f 
${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-                               
"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-               fi
-       fi
-}
-
-src_test() {
-       # respect TMPDIR!
-       local -x LIT_PRESERVES_TMP=1
-       # disable sandbox to have it stop clobbering LD_PRELOAD
-       local -x SANDBOX_ON=0
-       # wipe LD_PRELOAD to make ASAN happy
-       local -x LD_PRELOAD=
-
-       cmake_build check-all
-}

Reply via email to