commit:     67c9385d7ea283aa707ab5fed988ffe2b0ec972f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 07:21:42 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 07:21:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c9385d

sys-libs/compiler-rt-sanitizers: Remove old

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

 sys-libs/compiler-rt-sanitizers/Manifest           |   2 -
 .../compiler-rt-sanitizers-19.0.0.9999.ebuild      | 220 ---------------------
 ...ompiler-rt-sanitizers-19.0.0_pre20240706.ebuild | 220 ---------------------
 ...ompiler-rt-sanitizers-19.0.0_pre20240712.ebuild | 220 ---------------------
 4 files changed, 662 deletions(-)

diff --git a/sys-libs/compiler-rt-sanitizers/Manifest 
b/sys-libs/compiler-rt-sanitizers/Manifest
index ee0dd16f7337..12c1ae7eb978 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,5 +1,4 @@
 DIST llvm-gentoo-patchset-15.0.7.tar.xz 19300 BLAKE2B 
b70e81d744c2eba5cd851e7b690ce8979b3064973f522be7c93bfb541860000a4bc8b17219f8788dfc8a527217dd13946cf7836640698ddd3d4b3fde493dfbf8
 SHA512 
daffff6ae4a0874aff1a423b4bb36701ecb5a35a36ae91d4ed7fda58b83e50ffcdc30498c84be4711fd3e1f227bf312dbe930019203e0a131944439af2aa94f7
-DIST llvm-project-0b9f2847da79298ed09c29493245113f02b32d9f.tar.gz 216399453 
BLAKE2B 
ed13e6639d40bdda6dbd09eba0cc8e4f82f4f53ce3cff9742e902af1c306c60dcb6d5fb008057829d46bbbde391697726cba2096c52cf1592c00faf1e37430e4
 SHA512 
a5b0bf59fa228a41f0c904a42b4b96740fc5e5caa63248c546eb4a810e86d5d8d1d8df663051ed4444cc0389ffa6ec12ee5dbf7d94d6211a253319550d7fac1c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B 
f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5
 SHA512 
4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 
47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df
 SHA512 
fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 
95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d
 SHA512 
89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
@@ -10,5 +9,4 @@ DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B 
a950492f1dbfb874dff63b1ffe
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 
6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd
 SHA512 
ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-19.1.0-rc1.src.tar.xz 141259912 BLAKE2B 
e882ff54a96900b4948e572cf073c897df6b4ce159869a42c56a4c830187d83b8d9d9b3940dad22346f142f9674575191cc9d079312f0d9aa1105390c07f504f
 SHA512 
9f43dbe8d5f1322f73fb1c638ce4fc7a8179c9ca33fdbfbb6d72632a3d6bf4bc4993f8f5ec827510af55f4f013fba8fe3d7d9e45f262eec16ecf9ab39296b4b8
 DIST llvm-project-19.1.0-rc1.src.tar.xz.sig 438 BLAKE2B 
cc1acbd33440bb14f78c19cc3061a5c0cb3d9dbcd6f0d1516fe118ac02c500ba4df129f870ddf3fe1a52519feab4b631866413fce9c726272d52c3865a9eea27
 SHA512 
a3361992b55be13aeff5d91bb90a15e3a2ab89e486328fa4d9abc9efa3925aee70bea48449b003ae1926909d389bf71afcf6dc56d800ed2e0e3dbc65da6e4e92
-DIST llvm-project-1bad7024561bc64ed4bfda0772b16376b475eba5.tar.gz 216657623 
BLAKE2B 
99c48a95c427e8fae5568e5f59ab9bec8b2d8bec0c5d3cf453c261a738fe1c295b34e2e10e6b08d2b02cae43e3b0cd4c8eb025d19a83ee51f47a49afadd56d3f
 SHA512 
08fc904122ab346edbfc3903cafae4f50ba57e146b2d821a568f8378c0f3ab4d413e07c5df2bf061374f9db4634b5f6b27f204fc4f2f68984303ceec9c963c0c
 DIST llvm-project-72d8c2737bb557af9d0c735b9fa30b1b03485627.tar.gz 217324958 
BLAKE2B 
d43c161ac98860e2ce03e7e2474c55766e7496200b090ebb1cb6dcf0c2ad3a32bae76249feca53cd8b56c63806a740c280e6306890cd28429c4a7e84cae5eada
 SHA512 
af3b44ec3f96d636d919906cf20547eb91d0a83d07731c9db38f28311a52011d8ec66833422fad9bb89ca9ac546e308b02015a7b365086341bee1f3de1b6c5e2

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0.9999.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0.9999.ebuild
deleted file mode 100644
index d395b7fd5a11..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0.9999.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-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
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-       || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-       test? (
-               cfi? ( ubsan )
-               gwp-asan? ( scudo )
-       )
-"
-RESTRICT="
-       !clang? ( test )
-       !test? ( test )
-"
-
-DEPEND="
-       sys-devel/llvm:${LLVM_MAJOR}
-       virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-       clang? ( sys-devel/clang )
-       elibc_glibc? ( net-libs/libtirpc )
-       test? (
-               $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-               sys-libs/compiler-rt:${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
-               local -x CXX=${CHOST}-clang++
-               strip-unsupported-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 sys-libs/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_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
-               [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-               [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic 
compiler-rt install: ${sys_dir[*]}"
-
-               # 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 \
-                       
"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || 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/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240706.ebuild
 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240706.ebuild
deleted file mode 100644
index d395b7fd5a11..000000000000
--- 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240706.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-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
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-       || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-       test? (
-               cfi? ( ubsan )
-               gwp-asan? ( scudo )
-       )
-"
-RESTRICT="
-       !clang? ( test )
-       !test? ( test )
-"
-
-DEPEND="
-       sys-devel/llvm:${LLVM_MAJOR}
-       virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-       clang? ( sys-devel/clang )
-       elibc_glibc? ( net-libs/libtirpc )
-       test? (
-               $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-               sys-libs/compiler-rt:${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
-               local -x CXX=${CHOST}-clang++
-               strip-unsupported-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 sys-libs/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_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
-               [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-               [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic 
compiler-rt install: ${sys_dir[*]}"
-
-               # 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 \
-                       
"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || 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/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240712.ebuild
 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240712.ebuild
deleted file mode 100644
index d395b7fd5a11..000000000000
--- 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240712.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-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
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-       || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-       test? (
-               cfi? ( ubsan )
-               gwp-asan? ( scudo )
-       )
-"
-RESTRICT="
-       !clang? ( test )
-       !test? ( test )
-"
-
-DEPEND="
-       sys-devel/llvm:${LLVM_MAJOR}
-       virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-       clang? ( sys-devel/clang )
-       elibc_glibc? ( net-libs/libtirpc )
-       test? (
-               $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-               sys-libs/compiler-rt:${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
-               local -x CXX=${CHOST}-clang++
-               strip-unsupported-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 sys-libs/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_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
-               [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-               [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic 
compiler-rt install: ${sys_dir[*]}"
-
-               # 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 \
-                       
"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || 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