summaryrefslogtreecommitdiff
path: root/sys-libs/compiler-rt
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-01-15 15:51:32 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-01-15 15:51:32 +0000
commit21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
treee1810a4b135afce04b34862ef0fab2bfaeb8aeca /sys-libs/compiler-rt
parent7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
gentoo resync : 15.01.2020
Diffstat (limited to 'sys-libs/compiler-rt')
-rw-r--r--sys-libs/compiler-rt/Manifest16
-rw-r--r--sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild9
-rw-r--r--sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild7
-rw-r--r--sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild7
-rw-r--r--sys-libs/compiler-rt/compiler-rt-9.0.0-r1.ebuild111
-rw-r--r--sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild105
-rw-r--r--sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild (renamed from sys-libs/compiler-rt/compiler-rt-9.0.1_rc2.ebuild)9
-rw-r--r--sys-libs/compiler-rt/compiler-rt-9.0.1_rc3.ebuild105
-rw-r--r--sys-libs/compiler-rt/files/9.0.0/0001-compiler-rt-crt-make-test-case-nontrivial-in-check_c.patch41
9 files changed, 31 insertions, 379 deletions
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index a144f2f0f630..752dd2a7d97b 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,14 +1,8 @@
-AUX 9.0.0/0001-compiler-rt-crt-make-test-case-nontrivial-in-check_c.patch 1552 BLAKE2B 5045e2cc506282a6fb708c21e916a0e4ff24f0ccfbeb6d27af506c085ff759c203377e12ab969e40a2fbb9834bbc190de0e649061aec1b2ddd36b52ed99ede11 SHA512 d52245c1eaf650f8f666b9ec352332202fa5d76bdefd37a85f0c6939fecd8be80e386485851990efc918e53e82280489d0653d7c4e90637f328bd131bde6f6cb
DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b18a5d5cf53fa0560ad43b2ef39f5a2cd7ec1dbe4192cc8dac9b3f658b828c8306f26745c4d0e8f846d9f550ac22717eb33 SHA512 54d3ad80936f011dbf2ecebba3f1b7d4a156044b178228411ba855be5ec48eb646155b74dea1a96674adab6f93803456ae1435395e3240a4423a3f65f4566b55
DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
-DIST compiler-rt-9.0.0.src.tar.xz 1993084 BLAKE2B 4aece9570df4cc38aaa58a3740aa0e1b5cbfe0bfc2d1a590e9e95871fda6ba4dcdeab6125d243c31ce5130386235475339f13da9f900b505eb2fec850a711646 SHA512 a7bb0a67165d29317cee58c22ed79f0d6a9cb9279dcd355d4267f3cd6c531a7be455a28267c591d6e2c0f9c56e363d40c10a405391e07d02ab3e30f00ffef2a8
-DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
-DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
-EBUILD compiler-rt-10.0.0.9999.ebuild 2750 BLAKE2B c1be7a966c49f9b035b9ba8cdbb0b2e5b839a6a96ca68b45cc412a1bd5e94c41dcdb1df865723a758365cf176a5e5e77d2be1eed3dfb67cae341a854258849e8 SHA512 3958a62494587f94138cfe86e588f456ac75442f9ab7081c7aebb1719345e828e41dcf79f13d7fd2f857d52acf450aa3331589cc285c02ab8a86d9e330c52e38
-EBUILD compiler-rt-7.1.0.ebuild 2900 BLAKE2B 60bec479b6e5caa39b98e5bf54621e9cf395c7e20ce0269d336153811f39de065b53744c11bded995899a6be33cf207c0c4a091b4be8a9ce8b8b479d26b057e8 SHA512 6cf5d533db3bbc75125f40439f8a6132f6c0c4fa04bd1d6007e9014ae4638fb1e99d475da780e07d12509873c26d129696cbd657c6c0b79521aa0561a927b23e
-EBUILD compiler-rt-8.0.1.ebuild 2938 BLAKE2B 6ce7229e928bbd6b269b3d37ad233f188e831fc2dd3153346eecad4a031a6a6f7a82fa8c25020fc8169eeeeede6e138aee2d7b3f520be02c1f5450bb802fac9a SHA512 567c3cd3d932f02a5d0f627cac45fbbeb403b346a421e805a8a48289bddc8868d1307f35cd37f7d6ab60ecf466c0651c93dc1ace24b99971a3a131f0d12d6261
-EBUILD compiler-rt-9.0.0-r1.ebuild 2997 BLAKE2B 641abc9127b63a93a8c79762fc2a4a0136cec073b1869a9a9bdae1be0cb2db8b933d2562d26bb43f69b81828fb8af334f2737c2012af625437e824629eed7cb7 SHA512 af614fd60c9aba59d4ff7d35155632befa2f5d364572fc784c9c43fe5f1e76bfa0571bc84376e05cc1aa3f3b8f9b3d8219a0fd9e08dbfc016d7ce64c7b9a4098
-EBUILD compiler-rt-9.0.1.9999.ebuild 2750 BLAKE2B c1be7a966c49f9b035b9ba8cdbb0b2e5b839a6a96ca68b45cc412a1bd5e94c41dcdb1df865723a758365cf176a5e5e77d2be1eed3dfb67cae341a854258849e8 SHA512 3958a62494587f94138cfe86e588f456ac75442f9ab7081c7aebb1719345e828e41dcf79f13d7fd2f857d52acf450aa3331589cc285c02ab8a86d9e330c52e38
-EBUILD compiler-rt-9.0.1_rc2.ebuild 2826 BLAKE2B cca9e66ec831966d04067cd20af830e9e90b6b57316fa6ec3ad644747778f882e05a8a84cf55bcae6b0b9f88bb4fadf1273973628807eb90b3ff8895661e7050 SHA512 eb5d018acabebb23400af886010c5de40356aab46e4379418cad715336948f7c97abcb071b352317b5baee2358b3f88312a50ce48c5ca5ac5995aedefacbcdaf
-EBUILD compiler-rt-9.0.1_rc3.ebuild 2826 BLAKE2B cca9e66ec831966d04067cd20af830e9e90b6b57316fa6ec3ad644747778f882e05a8a84cf55bcae6b0b9f88bb4fadf1273973628807eb90b3ff8895661e7050 SHA512 eb5d018acabebb23400af886010c5de40356aab46e4379418cad715336948f7c97abcb071b352317b5baee2358b3f88312a50ce48c5ca5ac5995aedefacbcdaf
+DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
+EBUILD compiler-rt-10.0.0.9999.ebuild 2843 BLAKE2B ce9cf6dfdcd08882526e0d5b9b84e00e4e6b7a4d1510f93be4696e79c1cc617ad610d8e7571f816c0443d5864ba983db7323b9860b9b4dc5e3eb85e14e781cbb SHA512 f96067ed94567f092edaea97d7bc3c5f0071e65bfcd529c434e86230e790ee47973d5503f898b233f4f9ee661e184c2665a3cf0688355de1ad5c1c7dd8bea831
+EBUILD compiler-rt-7.1.0.ebuild 2995 BLAKE2B 6dadabb0e600a0490dd409eb07a618fa2eaddafa4adb815247cc0e0cbe2bf1fade0236edaac2a7bae62bcfcc6114b62055ace58ef85d2c077bb547c7da906d86 SHA512 0320889d2965f435dd84565da30a3f2628cf98f84c31a2323e628aff351ba3361427ec6b63d1dd0eb7063ee9ed0bc0ccaebbd2b1372f9fdeb0ab998f71e71918
+EBUILD compiler-rt-8.0.1.ebuild 3033 BLAKE2B f3c7a9dcca8b2858718999a35f1d36929935647ab35e9101de27343e56ae6c2cf5601aca85efd555956316c89c8d66e4a4c61c878c7ac6c3048c758be5ceb405 SHA512 37f75965dff847a4670022a8cc8a22724169b2b2529b88ac1d8862af80a25a8bf426c779623c02bfe7dbd8ac151fcb184bd37d6ad78816521d6f9025feecc872
+EBUILD compiler-rt-9.0.1.ebuild 2919 BLAKE2B 2472691af3dc15bf79d313fb201304206a3bf8a957da94f6f441a091f122c54dee6f16d68f10046af8a7191e07d709e9225e61427ec1419284fbd0e9280003f7 SHA512 9901423fdf71a0ec9a27f9f6904b7a50c0ebb8eabc2eb408aa4c27c5d38dfc0ddb713426a9e30b197d2c96c5d66e73735c636dd3a82e808ea0c6caa19bee406e
MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild
index 1c0ee0530aff..7a7778ae76b9 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
python-any-r1 toolchain-funcs
@@ -32,6 +32,11 @@ BDEPEND="
# least intrusive of all
CMAKE_BUILD_TYPE=RelWithDebInfo
+python_check_deps() {
+ use test || return 0
+ has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
pkg_pretend() {
if ! use clang && ! tc-is-clang; then
ewarn "Building using a compiler other than clang may result in broken atomics"
diff --git a/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild b/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild
index 1c2404f43c0f..8339d3420ba3 100644
--- a/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -36,6 +36,11 @@ S=${WORKDIR}/${P/_/}.src
# least intrusive of all
CMAKE_BUILD_TYPE=RelWithDebInfo
+python_check_deps() {
+ use test || return 0
+ has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
pkg_pretend() {
if ! use clang && ! tc-is-clang; then
ewarn "Building using a compiler other than clang may result in broken atomics"
diff --git a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
index ca77d0bb9d83..5049bf3761b8 100644
--- a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -37,6 +37,11 @@ S=${WORKDIR}/${MY_P}
# least intrusive of all
CMAKE_BUILD_TYPE=RelWithDebInfo
+python_check_deps() {
+ use test || return 0
+ has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
pkg_pretend() {
if ! use clang && ! tc-is-clang; then
ewarn "Building using a compiler other than clang may result in broken atomics"
diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.0-r1.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.0-r1.ebuild
deleted file mode 100644
index ed72a058928f..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-9.0.0-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
- python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( compiler-rt )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+clang test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
-DEPEND="
- >=sys-devel/llvm-6"
-BDEPEND="
- clang? ( sys-devel/clang )
- test? (
- $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
- =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
- ${PYTHON_DEPS}"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-PATCHES=(
- # Fix building broken crtbegin/crtend
- # https://bugs.gentoo.org/698086
- "${FILESDIR}"/9.0.0/0001-compiler-rt-crt-make-test-case-nontrivial-in-check_c.patch
-)
-
-pkg_pretend() {
- if ! use clang && ! tc-is-clang; then
- ewarn "Building using a compiler other than clang may result in broken atomics"
- ewarn "library. Enable USE=clang unless you have a very good reason not to."
- fi
-}
-
-pkg_setup() {
- llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-test_compiler() {
- $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
- <<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
- # pre-set since we need to pass it to cmake
- BUILD_DIR=${WORKDIR}/${P}_build
-
- local nolib_flags=( -nodefaultlibs -lc )
- if use clang; then
- local -x CC=${CHOST}-clang
- local -x CXX=${CHOST}-clang++
- # ensure we can use clang before installing compiler-rt
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
- strip-unsupported-flags
- elif ! test_compiler; then
- if test_compiler "${nolib_flags[@]}"; then
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
- ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
- fi
- fi
-
- local mycmakeargs=(
- -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-
- -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
- -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
- -DCOMPILER_RT_BUILD_PROFILE=OFF
- -DCOMPILER_RT_BUILD_SANITIZERS=OFF
- -DCOMPILER_RT_BUILD_XRAY=OFF
- )
-
- if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
- mycmakeargs+=(
- # disable use of SDK for the system itself
- -DDARWIN_macosx_CACHED_SYSROOT=/
- )
- fi
-
- if use test; then
- mycmakeargs+=(
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-
- -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
- -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_test() {
- # respect TMPDIR!
- local -x LIT_PRESERVES_TMP=1
-
- cmake-utils_src_make check-builtins
-}
diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild
deleted file mode 100644
index 1c0ee0530aff..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
- python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( compiler-rt )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS=""
-IUSE="+clang test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
-DEPEND="
- >=sys-devel/llvm-6"
-BDEPEND="
- clang? ( sys-devel/clang )
- test? (
- $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
- =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
- ${PYTHON_DEPS}"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_pretend() {
- if ! use clang && ! tc-is-clang; then
- ewarn "Building using a compiler other than clang may result in broken atomics"
- ewarn "library. Enable USE=clang unless you have a very good reason not to."
- fi
-}
-
-pkg_setup() {
- llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-test_compiler() {
- $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
- <<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
- # pre-set since we need to pass it to cmake
- BUILD_DIR=${WORKDIR}/${P}_build
-
- local nolib_flags=( -nodefaultlibs -lc )
- if use clang; then
- local -x CC=${CHOST}-clang
- local -x CXX=${CHOST}-clang++
- # ensure we can use clang before installing compiler-rt
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
- strip-unsupported-flags
- elif ! test_compiler; then
- if test_compiler "${nolib_flags[@]}"; then
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
- ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
- fi
- fi
-
- local mycmakeargs=(
- -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-
- -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
- -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
- -DCOMPILER_RT_BUILD_PROFILE=OFF
- -DCOMPILER_RT_BUILD_SANITIZERS=OFF
- -DCOMPILER_RT_BUILD_XRAY=OFF
- )
-
- if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
- mycmakeargs+=(
- # disable use of SDK for the system itself
- -DDARWIN_macosx_CACHED_SYSROOT=/
- )
- fi
-
- if use test; then
- mycmakeargs+=(
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-
- -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
- -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_test() {
- # respect TMPDIR!
- local -x LIT_PRESERVES_TMP=1
-
- cmake-utils_src_make check-builtins
-}
diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.1_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
index 6bca0d26b58e..55650e04a52c 100644
--- a/sys-libs/compiler-rt/compiler-rt-9.0.1_rc2.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
python-any-r1 toolchain-funcs
@@ -32,6 +32,11 @@ BDEPEND="
# least intrusive of all
CMAKE_BUILD_TYPE=RelWithDebInfo
+python_check_deps() {
+ use test || return 0
+ has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
pkg_pretend() {
if ! use clang && ! tc-is-clang; then
ewarn "Building using a compiler other than clang may result in broken atomics"
diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.1_rc3.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.1_rc3.ebuild
deleted file mode 100644
index 6bca0d26b58e..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-9.0.1_rc3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
- python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( compiler-rt )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+clang test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
-DEPEND="
- >=sys-devel/llvm-6"
-BDEPEND="
- clang? ( sys-devel/clang )
- test? (
- $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
- =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
- ${PYTHON_DEPS}"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_pretend() {
- if ! use clang && ! tc-is-clang; then
- ewarn "Building using a compiler other than clang may result in broken atomics"
- ewarn "library. Enable USE=clang unless you have a very good reason not to."
- fi
-}
-
-pkg_setup() {
- llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-test_compiler() {
- $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
- <<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
- # pre-set since we need to pass it to cmake
- BUILD_DIR=${WORKDIR}/${P}_build
-
- local nolib_flags=( -nodefaultlibs -lc )
- if use clang; then
- local -x CC=${CHOST}-clang
- local -x CXX=${CHOST}-clang++
- # ensure we can use clang before installing compiler-rt
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
- strip-unsupported-flags
- elif ! test_compiler; then
- if test_compiler "${nolib_flags[@]}"; then
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
- ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
- fi
- fi
-
- local mycmakeargs=(
- -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-
- -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
- -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
- -DCOMPILER_RT_BUILD_PROFILE=OFF
- -DCOMPILER_RT_BUILD_SANITIZERS=OFF
- -DCOMPILER_RT_BUILD_XRAY=OFF
- )
-
- if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
- mycmakeargs+=(
- # disable use of SDK for the system itself
- -DDARWIN_macosx_CACHED_SYSROOT=/
- )
- fi
-
- if use test; then
- mycmakeargs+=(
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-
- -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
- -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_test() {
- # respect TMPDIR!
- local -x LIT_PRESERVES_TMP=1
-
- cmake-utils_src_make check-builtins
-}
diff --git a/sys-libs/compiler-rt/files/9.0.0/0001-compiler-rt-crt-make-test-case-nontrivial-in-check_c.patch b/sys-libs/compiler-rt/files/9.0.0/0001-compiler-rt-crt-make-test-case-nontrivial-in-check_c.patch
deleted file mode 100644
index ccae96cad98a..000000000000
--- a/sys-libs/compiler-rt/files/9.0.0/0001-compiler-rt-crt-make-test-case-nontrivial-in-check_c.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 155a43edb0c161bb5122ad4eeee991b43a0278bc Mon Sep 17 00:00:00 2001
-From: Jian Cai <caij2003@gmail.com>
-Date: Mon, 16 Sep 2019 21:47:47 +0000
-Subject: [PATCH] [compiler-rt][crt] make test case nontrivial in
- check_cxx_section_exists
-
-Summary:
-.init_array gets optimized away when building with -O2 and as a result,
-check_cxx_section_exists failed to pass -DCOMPILER_RT_HAS_INITFINI_ARRAY
-when building crtbegin.o and crtend.o, which causes binaries linked with
-them encounter segmentation fault. See https://crbug.com/855759 for
-details. This change prevents .init_array section to be optimized away
-even with -O2 or higher optimization level.
-
-Subscribers: dberris, mgorny, #sanitizers, llvm-commits
-
-Tags: #sanitizers, #llvm
-
-Differential Revision: https://reviews.llvm.org/D67628
-
-llvm-svn: 372038
----
- lib/crt/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/crt/CMakeLists.txt b/lib/crt/CMakeLists.txt
-index 34c368f7ca4..90e94b93db4 100644
---- a/lib/crt/CMakeLists.txt
-+++ b/lib/crt/CMakeLists.txt
-@@ -70,7 +70,7 @@ function(check_cxx_section_exists section output)
- endfunction()
-
- check_cxx_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY
-- SOURCE "__attribute__((constructor)) void f() {}\nint main() { return 0; }\n")
-+ SOURCE "volatile int x;\n__attribute__((constructor)) void f() {x = 0;}\nint main() { return 0; }\n")
-
- append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 CRT_CFLAGS)
- append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS)
---
-2.23.0
-