gentoo resync : 10.03.2018

4 files changed, 45 insertions, 3 deletions

diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 38faa1205cfa..4c28428eb0c9 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -11,7 +11,7 @@ EBUILD libcxx-3.7.1.ebuild 5335 BLAKE2B 6f4dbbb8dbc7f6e8b97f05ff3e638bb037bad416
 EBUILD libcxx-3.9.1.ebuild 6815 BLAKE2B d15c83602e244f8a50e0a9d15869dbd4c7be226d8b1f93249cb6658149ad2408f0feada97403a0dfa3dcd8ac25b98ae084d1d17c879f67ae24d33f8497aba569 SHA512 9c9632590b49cd01ad324641ee296f08442940ab1dda1f0c7cdc77abe6b653f70d0baa9b796ef7d77e1f4728e96fe27fcd42d79a389cfcf2b2427b087b9985af
 EBUILD libcxx-4.0.1.ebuild 6301 BLAKE2B d4a17d742479e7532c986046fe12b4aed0d1e59faaebead864f7e3f91c4be82aa5d708a7efe2038a146151d10530b0f31a34006e8af6c4dc24f18537dc8c0feb SHA512 8e4a82071fd5945f7876adc9cd20ed2d35ee952711574e8ac2b735d60299b480e269b07ad829c015377c8042a54b6604ffcfe41f98869b25844c00b62bec3b46
 EBUILD libcxx-5.0.1.ebuild 6301 BLAKE2B 3a8fc402a70214032823a1590a8ca088e16bb84ad0d75acda69c9dc306747e8b9c9fe48179e3c9481765ab656217a7f76ecee9c4a1d6a61d9923fad7c624d8c7 SHA512 ffe69b27e9358cea5a31b64f6a1f335565b2229ba6ecfad5636b813df174daffa6a2ca6f47f30da1d7e833aea803ce2be1e3f95589a379af4c138c212bc0df64
-EBUILD libcxx-6.0.0.ebuild 6260 BLAKE2B 1fe2c19c9647785a1d74df09134a1e0a7613459489f78481ca3feea6fcc63801db5c804b48877acf73a220d357e2fe0b56d414990a3b340c98ab9a6e7b827655 SHA512 c5e9584950341719275184a5d52a94743bd312c04e630658e428ee18fb591536441fab793a8bea1677dec6d4f6657cc117771b83998e1eecb220c11a4be55af1
-EBUILD libcxx-6.0.9999.ebuild 6578 BLAKE2B 0f6f36280e4b525551a8105556f9b7e3a4fb54fc044461d9fd41f2380cdeef2022d0143692b2652d42160ec955963c6b69e3192c5ac9d39aaf11573a4c9b0142 SHA512 7fe8bf31c0ef5e62e904b19b045dbd746ce9c109a4e723c77e8a556f787abea60b3999cd1095bbee0ba3d03252069a804843f2fb2b76dfb5de63f926b2edd110
-EBUILD libcxx-9999.ebuild 6550 BLAKE2B 8c85f392d8bdd4d9c69f7b58be8f01352c5715de24f4461ddb63a2da49c5773b2796b0a6cdb8b77f511c2cb8c14b1a2e13f5758eddf0c01aa3bc892aaeca2ebd SHA512 72f98b822d320848d45a5f7676dd462dd433d07b8eff3b3c61b16c4e684f244ba83c6b0d4d008be858950a655ae4f28fa58667a238c84e38af88a4c5a768278d
+EBUILD libcxx-6.0.0.ebuild 6702 BLAKE2B 07ecb57d7bb8e443dcd67f1264aaea3506c2d0542bf319b51258c09c687f7703776f466e37c066d15e7e0af855c9c8dd49125db1f1eb08096d1b3e89f7663ebc SHA512 6f0f5db33afa4e1b837f37ebd66a8d5115217d3c622f076a208f8ce83aa18465ab49be81c0c25bbe51aa3afe5de9ccf578bdb18ff526ce76103c1e877c83f92a
+EBUILD libcxx-6.0.9999.ebuild 7020 BLAKE2B 550b6aba9d3bbdb22a57d989795461d5dd723061623673637f81b0a0847647ce77f5540831d17c86ba26f8aa4571d42c77c0648de85e8aac7107d3bf35981895 SHA512 9e408776b6c6a7806d04ec96d205887493a531691711cfe4c676214c33f99c1494aaeb25307c09c8606c073c10c6ae6e6a894fb958488d2dd41977cfdc0fbdd8
+EBUILD libcxx-9999.ebuild 6992 BLAKE2B ca6c1858b79b56d987ec0ea9aea817ffba40aa9b6a2eeac7bfe3b1303ae849cd434fd0044688fd2220b3940dc52a35d3ee5f1939e030cf3181d5528351ad9604 SHA512 f8690d503888b03b511eae8575b996764ee5c2d4cc7d9afefea9576d635736d653655306d7af1c4028497aeded6e2f423b8ba6dcd08f62a79f0ea846e9532cbf
 MISC metadata.xml 854 BLAKE2B f731ffbb07722face32cfe5ef0576c572fc45d93e8d78ec4adb46c43b95999dc4eb48f20311517fe08a397f2e5dec56c530bb6787a058358cfd1af8d79ffad90 SHA512 8ef3feab266e09442a42baced2d72667fa8b1290624c2c84bab7b173ead72669568847f6e995388fc1d7bc722381f60805d87b2a0cc2d04ae0c49e36bec3802a
diff --git a/sys-libs/libcxx/libcxx-6.0.0.ebuild b/sys-libs/libcxx/libcxx-6.0.0.ebuild
index 9c9b75e3d7f1..0948ab0c6825 100644
--- a/sys-libs/libcxx/libcxx-6.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-6.0.0.ebuild
@@ -73,6 +73,11 @@ pkg_setup() {
 	fi
 }
 
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
 multilib_src_configure() {
 	local cxxabi cxxabi_incs
 	if use libcxxabi; then
@@ -109,6 +114,15 @@ multilib_src_configure() {
 		fi
 	fi
 
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
diff --git a/sys-libs/libcxx/libcxx-6.0.9999.ebuild b/sys-libs/libcxx/libcxx-6.0.9999.ebuild
index cf76bba5fdfd..4e687c722c60 100644
--- a/sys-libs/libcxx/libcxx-6.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-6.0.9999.ebuild
@@ -85,6 +85,11 @@ pkg_setup() {
 	fi
 }
 
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
 multilib_src_configure() {
 	local cxxabi cxxabi_incs
 	if use libcxxabi; then
@@ -121,6 +126,15 @@ multilib_src_configure() {
 		fi
 	fi
 
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index 214c61d31f67..f304a076c171 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -84,6 +84,11 @@ pkg_setup() {
 	fi
 }
 
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
 multilib_src_configure() {
 	local cxxabi cxxabi_incs
 	if use libcxxabi; then
@@ -120,6 +125,15 @@ multilib_src_configure() {
 		fi
 	fi
 
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}