commit:     94236e5ccbe50fbf0fd5ee379478e4556a827e92
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  6 04:55:02 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 04:55:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94236e5c

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

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

 sys-libs/compiler-rt-sanitizers/Manifest           |   4 -
 .../compiler-rt-sanitizers-18.1.2.ebuild           | 218 ---------------------
 ...ompiler-rt-sanitizers-19.0.0_pre20240316.ebuild | 217 --------------------
 ...ompiler-rt-sanitizers-19.0.0_pre20240322.ebuild | 217 --------------------
 4 files changed, 656 deletions(-)

diff --git a/sys-libs/compiler-rt-sanitizers/Manifest 
b/sys-libs/compiler-rt-sanitizers/Manifest
index a3c86dbf2a0a..44020d12332a 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -5,10 +5,6 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 
95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 
2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a
 SHA512 
ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B 
d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2
 SHA512 
6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 
186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7
 SHA512 
f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-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-18.1.3.src.tar.xz 132049300 BLAKE2B 
0681177cfe6a65f5cf11942381078388e8f5d9d5a4bb50b040e4c10a3898e7311ff379fcca008e82e4bef225792a38eb77f722c972725b9251a0fda29d8d7ecc
 SHA512 
b8b8a00c560bc7d4c4b5d533b92dbd52f2c0254f0acf687e787e8b7fa780cd5d96f6e9709356d2c406c0b36b186dee4de6b1bc1928a97de0bda863fa873e0783
 DIST llvm-project-18.1.3.src.tar.xz.sig 566 BLAKE2B 
dcecf41346cc864c6e5bedd3a7db3db4f32a68534364d2537a15ca7e4e2f2d35a22722385ac556d2a4ac48ab37567566094f223534e696299f98040e702146d0
 SHA512 
b7e50779841891e9ed9de5ed917c5be3209a52a5d98c67a032509ae8fad8a2a882bf619c66d2ee45bb53dfb03d750cb94dc4b2750ec2a8edb0465700d5bc657c
-DIST llvm-project-6d3cec01a6c29fa4e51ba129fa13dbf55d2b928e.tar.gz 207700152 
BLAKE2B 
855720b7a9cc7b1d8fdf398394eb5c702dd615c04e7dad51c449cb1c2f46e75f2ccf2ee10fa3a3403d6aec29f557023a11bd8cdb525bc9c3d76c79f23cd15e82
 SHA512 
ff6269158e165907c69bd3e4d2d6b87b4f4670546b7e290d7e6665e7097ec887d71174fa37bf5e1755524317e8ae8f0c7c7e428049e8b553faa52c614f1f4490
 DIST llvm-project-a8b0ecd2605ff23f495a8af64e06c35f86834e54.tar.gz 208451583 
BLAKE2B 
3f8557637b9d10ed924cfec0b3e83d85996417df24b317cac55740aa199ef97cf7560fe634debd1dbfc7c9fc25aa2b2643fccaecc4c866481dc57b11eba1d02f
 SHA512 
1f4bf5a8a59582af426ad13cc828e1e482c5c831ed5a4bb0da419ed3cf67e5e485fd36074603ad22328e35be44b8ccd2d92d1382bc7a228fdf38d458a2321e07
-DIST llvm-project-f3cfe016c5d8429c0dccfa6f85442e2ea0d45a58.tar.gz 208184654 
BLAKE2B 
abd35798f7c921866bb221cecc42aa94915271d0804acbf44dbe5640efb787ef9d928c329eacde768fac4292217ed4d3c4187fba02dd1c826059aeaa1bad33f0
 SHA512 
513f7278367114ba3fe3271e8a790b62adbca97d280968537e44e5df9a7afb467a5ca93480f4d4fb7c4d5c0734d00ab54559bf68c00f09a1fcff2fee492aa84f

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.2.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.2.ebuild
deleted file mode 100644
index 192ead8311f8..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.2.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos 
~x64-macos"
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-# base targets
-IUSE+=" +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/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_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_pre20240316.ebuild
 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240316.ebuild
deleted file mode 100644
index 57f868d54be6..000000000000
--- 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240316.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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+=" +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/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_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_pre20240322.ebuild
 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240322.ebuild
deleted file mode 100644
index 57f868d54be6..000000000000
--- 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240322.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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+=" +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/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_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