gentoo resync : 05.02.2020

7 files changed, 126 insertions, 14 deletions

diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 1ab2d90bfab5..89bb8db6dfbd 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,9 +1,11 @@
 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 llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 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-11.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 2916 BLAKE2B 13721d25f8927c7936d5dcdd501c166694868c1db3770fb6b0a06226a367df5257a607fb61e0725aac52a9ace16380b2096b57bddcbd01807253db41167eb45e SHA512 74b3348cce05d87fdcf7cfd07691e00c03c112e84173d3e1a474ddb84fd78c6e587afa93c7ae6f6dcf52eaed41105a682c1c0e361e37eb15b3e9d58d96cd3d8c
+EBUILD compiler-rt-10.0.0.9999.ebuild 2851 BLAKE2B 1744be5c165d1144ebee9a9851b9ebf22b43a8d02d41adb7a425923909202096ed6e60ae477080936ecbc3d0a648e6946a3ab5bcf9a7edb8df18e35fd5c701eb SHA512 abdbae4765be38f5427e6eee3a50acdde22ab2c5ded3953ca2ffdd8842fa0d50649af5074fd91bfe2190ccddea3b176d45c6196abaf018bc45e5ae4dc3c03ecd
+EBUILD compiler-rt-10.0.0_rc1.ebuild 2851 BLAKE2B 1744be5c165d1144ebee9a9851b9ebf22b43a8d02d41adb7a425923909202096ed6e60ae477080936ecbc3d0a648e6946a3ab5bcf9a7edb8df18e35fd5c701eb SHA512 abdbae4765be38f5427e6eee3a50acdde22ab2c5ded3953ca2ffdd8842fa0d50649af5074fd91bfe2190ccddea3b176d45c6196abaf018bc45e5ae4dc3c03ecd
+EBUILD compiler-rt-11.0.0.9999.ebuild 2851 BLAKE2B 1744be5c165d1144ebee9a9851b9ebf22b43a8d02d41adb7a425923909202096ed6e60ae477080936ecbc3d0a648e6946a3ab5bcf9a7edb8df18e35fd5c701eb SHA512 abdbae4765be38f5427e6eee3a50acdde22ab2c5ded3953ca2ffdd8842fa0d50649af5074fd91bfe2190ccddea3b176d45c6196abaf018bc45e5ae4dc3c03ecd
+EBUILD compiler-rt-7.1.0.ebuild 2995 BLAKE2B 59d478fc487ca1293bd34d719b119d2a4a89a5d623e4b0d0e487c4c7df31bc096dc9ff072b3b5eed94807c3f88d8b2d84daa464a556ba27714efbca22b098207 SHA512 7d5207c13be7861eb07872de640b8bbc5e2a2a732f0a541dc78b92cc0e048b555b2a3378294366b317032afb4f7b3e67cf8da44518cab6d554c49a6d217287e4
+EBUILD compiler-rt-8.0.1.ebuild 3033 BLAKE2B aae9682b1069da7024ea1e4bfd29914015cd2eb043d0f56fccc4d817bdf32ccdb3121f25232fe15fafa7e17d5bb9600de57c82b700d571d3ed2b3af3bf0d3673 SHA512 4ccaa041025603d7582775b1982a9644305110268d461bbdfdcfe094e0a85df0dd258aaf378e33d8a63ed6c5ff6d8f2f6701a69564c4ef1ab1a0662001d735da
+EBUILD compiler-rt-9.0.1.ebuild 2923 BLAKE2B f987a6708cf56b8f13b331d9e82e958a6e6c18c597d0bb921641fa45d383223a5fee6989b7af1a57ec5621aa9d0298bb44cdc300d96a28a03562f92c3eaf86e8 SHA512 6fabe2784e7c0cee3073f3b38617ed69e9a8b0fb4f0320619837fcc0733a2e01749c6af97ba010c3ba6e51408961269b397b260f3ecd9f413fe429a0e34466e1
 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 7a7778ae76b9..fb90bbaab7cf 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
@@ -25,7 +25,7 @@ DEPEND="
 BDEPEND="
 	clang? ( sys-devel/clang )
 	test? (
-		$(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
 	${PYTHON_DEPS}"
 
@@ -62,9 +62,9 @@ src_configure() {
 	if use clang; then
 		local -x CC=${CHOST}-clang
 		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
 		# 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[*]}"
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild
new file mode 100644
index 000000000000..fb90bbaab7cf
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{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-9.0.1[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
+	${PYTHON_DEPS}"
+
+# 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"
+		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++
+		strip-unsupported-flags
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_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-11.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
index 7a7778ae76b9..fb90bbaab7cf 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 BDEPEND="
 	clang? ( sys-devel/clang )
 	test? (
-		$(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
 	${PYTHON_DEPS}"
 
@@ -62,9 +62,9 @@ src_configure() {
 	if use clang; then
 		local -x CC=${CHOST}-clang
 		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
 		# 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[*]}"
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 8339d3420ba3..1962c02d2f22 100644
--- a/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-7.1.0.ebuild
@@ -66,9 +66,9 @@ src_configure() {
 	if use clang; then
 		local -x CC=${CHOST}-clang
 		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
 		# 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[*]}"
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 5049bf3761b8..403e394f7446 100644
--- a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
@@ -67,9 +67,9 @@ src_configure() {
 	if use clang; then
 		local -x CC=${CHOST}-clang
 		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
 		# 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[*]}"
diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
index f93feb036d6c..f5ce47c037e8 100644
--- a/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
@@ -25,7 +25,7 @@ DEPEND="
 BDEPEND="
 	clang? ( sys-devel/clang )
 	test? (
-		$(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
 	${PYTHON_DEPS}"
 
@@ -62,9 +62,9 @@ src_configure() {
 	if use clang; then
 		local -x CC=${CHOST}-clang
 		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
 		# 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[*]}"