Set linker to bfd when gold is detected #470634 by Nick.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

7 files changed, 49 insertions, 26 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 83557a4a5e3a..8a6f29c2f139 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.373 2015/02/20 16:05:58 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.374 2015/03/16 23:09:51 vapier Exp $
+
+  16 Mar 2015; Mike Frysinger <vapier@gentoo.org> db-4.8.30-r2.ebuild,
+  db-5.1.29-r1.ebuild, db-5.3.28-r2.ebuild, db-6.0.30-r1.ebuild,
+  db-6.1.19.ebuild:
+  Set linker to bfd when gold is detected #470634 by Nick.
 
   20 Feb 2015; Mikle Kolyada <zlogene@gentoo.org> db-4.8.30-r2.ebuild:
   ia64 stable wrt bug #525282
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 3f2545a1bb86..0fc255adbc71 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -79,23 +79,31 @@ EBUILD db-4.5.20_p2-r1.ebuild 5099 SHA256 be4380149b54e98e5656c93ac5c41e895fbb8a
 EBUILD db-4.6.21_p4.ebuild 4825 SHA256 1f1a8ff9fb54421252df74603f5d3b3739ecb33fab4f254fe9a3d1ef62bfaec0 SHA512 baa46c38441fc982f287a582713a72179e2481158571e6a6790c3a4636874bd3e22566a58e4ad0f64c96b4a07d7ebaacdd6ae26fa8199976e3165359c194ed33 WHIRLPOOL c4dbed87d59372aaeb636241cd2cee445f5df7347dbb47129efa9027e254567320d64f47bff1fc10eb4818040d06500c59d0718856e059b8a9549083ae3f87da
 EBUILD db-4.7.25_p4.ebuild 4360 SHA256 c1326c862fcaacc626e239b155b78d3f2c3fda3403b372301c7efe1021b21a49 SHA512 92944741cc786bf27c22d4dba1cb7273978181d448794afcb7b98123b949fbf8cbc08be972df83c49083af10f7d651f156ed30fc6fb1eb4a72d33c0635bd6d4a WHIRLPOOL 68cf35de0017c9797521b7c24d5636ace309b839511918280ff72d3cb0f5cfd2176848eb40dba8c737451b5c9895ab6ff14de07bd007413d8f4aff4bc5e25658
 EBUILD db-4.8.30-r1.ebuild 5136 SHA256 9a337e4106a82eecc29d8f559923cb30d98fba4576756eafe8f6f2b2efbf3cd4 SHA512 417293a2db18fe97021cf54918b8243fd62ff378215ca9c09ba28457c2a693bb3ada0195fe67bd3158f40c056e9d78e5f630115a4580e98c03016b007d278dc9 WHIRLPOOL 7d85cf19584db88843af6fd4b67d8543aba8100efd161bfe50a9024f56f4171edbbe3ad012ce58c189d5361a364150d05241dc0e3bb6b967ac79bdd1e4a09b6a
-EBUILD db-4.8.30-r2.ebuild 5128 SHA256 f347ff6b5657a7b03795fe06dd418e9b42dea56321526a70b93b192ec55f2540 SHA512 5af00741af84bd58f893d0357a3fa01d14a1ed693fcc86c1a692973ff1a19d545209e3170dea6cb626ea956a906ed606b5359021569eaabd9d3c29cf9905fd9b WHIRLPOOL 373be5f415205d172e8b2e723b3b1f1edf2deed877096a826779274e5f898ed3b351cb53eac2bac35f24c284ee07561048598e07a342f7b143f5694e7a6e9544
+EBUILD db-4.8.30-r2.ebuild 5172 SHA256 1a6cf1f4736b6c4b325e17caf53a6d7aa246ad21246505667807731410af224e SHA512 e90b077a1bbfc77cf8581a73baec290dc365cedcf1013717c2f641e67e0128149c5fd3304b590bd5a8fee9020e37ec4ff68fd2d2cd8267601b94549931c18c6e WHIRLPOOL f7a372bf6baaf919f61046158077f5be00b07f9a856a605d6460b8b7de00ba4d6acd33ae0e74b479b3248e4585274e3ba91e93ce1797b38106b2a3fac4533b72
 EBUILD db-4.8.30.ebuild 4562 SHA256 fe7409e1b17ccc13af1fe941f5f685d05ac310d66ad8a24b116d9957ac145f5f SHA512 2613a9cc3e04411d7a6faacdf62657d832ca505821af9d061eb6767a1169cc733f609928b335696d385837e676bee75f92e405fb7461ba4ac244b81d5c03d5dd WHIRLPOOL 02bcb8f47dce6a1a567465b93fd7ab8e197796832b1f87ae2dab18fd4f8ecb78006495bd475d96b9dfe0cb1f56e8ee3d5198112e96c756d9932791f5f53456aa
-EBUILD db-5.1.29-r1.ebuild 5384 SHA256 8900acf42b898b8c7619f05777ba295654cfedf3dc1867aa43c70303a6177a57 SHA512 4cb337386bdc79b5e0244617ca14df2fc1959959e4f8d8ceb8dd799eeae1bfcadc5038c860e56c1c85159486e8781bc308488c9e6dd8e8e2db1eeb244dabf19a WHIRLPOOL a94fb86f35b55983551aed08e7413b529bd35f39d585148d3609e936356a74a91112cb1cd433a4fa87c8b71a2a654341dc373b940466abd9cdbc486afa25957e
+EBUILD db-5.1.29-r1.ebuild 5428 SHA256 b6a928ec96786a4d2af9784d2ece97526ebf7afcba4c2856399f50fd9daab0e2 SHA512 95006891da1e40cc2a92fc04f80591aa14497b9b8558399edd13569d5425d9b1743f2e8bcaff7dd9e7709df168dae1fa355f484334c20ed277014ec3b3fd25b0 WHIRLPOOL 53158e690e2494c1d7a0de840d707bfacd9cdad28e2ae6ab819c0d597bbc2d6112f82ccfe0613b8aecc9e39a70dcb7806432d17f2cbf33b9f44ba2cdc8038860
 EBUILD db-5.1.29.ebuild 5393 SHA256 c6ac68ea12fccd4fe97892af30f25909418d605b1e98e92ff062714bc69a4b12 SHA512 f02dcf3434ca388a97bf59fb5e925503b1d4f332f63941c8d098eaaf8c8c3efda3dbe73852074de0f54329b949e73548fdbefa831f60a16167e2a5c4ac3a22ce WHIRLPOOL 89609f988335d512116ce103baf5ae24adcbb5b707ffd28e1a4c4975eaa7497202e20fd40a455c564f9fc6d0ee2914314dea7be3ca60ed74cead5d94f65fe773
 EBUILD db-5.3.28-r1.ebuild 6086 SHA256 0fcc323de3ca62f743580b114d88e8dcd3c59d5d72088f05da954a1c749a5300 SHA512 73925fbe9f43754f12c205030d23570338458146c3c74be33f1374e3f1545193f19e77f2bc49cd5064d0b531b75fbe0c9023b99b7242491c008e1f8ce215dadf WHIRLPOOL 18364228c4babe42239ac904cac48a103589416e429c3c85cbde1dbdbaef9a150fa540245d1a379336339c5a6a29270012e3a2cab829fe9784ae11616f6244af
-EBUILD db-5.3.28-r2.ebuild 6590 SHA256 4ab811618daaa0112aafea7cfc4473fc7b47d73a9262b5e2bd7a0eeb314b99f8 SHA512 c8751d1bba9cd54ae57acf415b9e546887d5967a3a53fad044b4bd90f3dd6d9e071aee3109a2e20ec3cfc451e1dd18c9e32ef48c976cb8a6bdcf31feb72125c6 WHIRLPOOL 893f0e8dca47e06f4a39de2c403cc14271fb9cbc092469c887f34fee2797217b6638e9cb3ffcd90d62315557275804ed0d51adf657df499ab3e85e9f9cf5e892
-EBUILD db-6.0.30-r1.ebuild 6705 SHA256 d355f9e7910b3f1cde7f5fde08bb4f4fd76a486f5ff09677648a066ac634c60f SHA512 8213f23a60f4c32d9809441acfd7450f828d44f69ddbbc467fe1b714ff01a32a116368d59a0187c01fc7f6fa761afa333067c46e3f7b981171a4b6e2e6d91cce WHIRLPOOL c330e3bb2ab0be8be3e2f5a661ba8e1511a4eed5cfc35b4bce9692cdeb6cf1e1052b405c7f5c53ee44d371eb2e69750e20f70a6ccd850c308df0e8ab01592fdd
+EBUILD db-5.3.28-r2.ebuild 6635 SHA256 445946633702eb20ebc33a90d75e16b39472bbc3251ea033b2978ecf00e0cc6f SHA512 f10e9212e0b702afce42354ddfbb36e70214b5918784318c00b88ef8e07bfdc530833340421f16cd3a39d04f29205f2be543bd112776cd06895294c41a273dc6 WHIRLPOOL d9288a57cd03a8b7da46ae03796e0618185f3c077d85c3966b9d47db13955d208bb8e4d81fd3242e27021808cf998610a5d91c02495b6cfa607ae2578d9870ce
+EBUILD db-6.0.30-r1.ebuild 6749 SHA256 d605c78c3297bb7f4732ffe1c4e111c3dfbef7176144f8a79e921088573957f2 SHA512 549fb2cdb79b14a0adde0bd45148608bc62fa1ceb6a7a08adac3ca0aa922d65b304d13201cfca3d3877d16937975e1eb5f8167c9e39120a1db3a9f3bfad0de0f WHIRLPOOL f68e8c3b18820d4f8e1323d8a7246f978240eeffce85fdb850a52f5e016d24ad7a8afc12257deb8dcdc2e1ab77d5476fb74e99e7a0a566db3a625dd7016a360c
 EBUILD db-6.0.30.ebuild 6714 SHA256 29bf09b815b4ebff90a9c8cff2b2f5342a567f147f02f24f759535620e18ca00 SHA512 eb3dae0caf8affbbbb33f72c605e464ce40780602b9ac8409f1cefe3e785f210a7d5ea910a6905709e6a564675cf8c7dc1a8e9f544c4d6283e2e55bb0f7a0df9 WHIRLPOOL 056531e5e6dd67880778ab5e009a4aaaac6f417274441192fea4e2a71c8357ef8581fd7abbaa826ae322ae42eaade7f4b7c0cd3b1d8295886fd5567e71e2ead3
-EBUILD db-6.1.19.ebuild 6702 SHA256 67bc682e70b83ad27768b5c21aee4b74ce1d7773cdca9dcc6dc5cbae48c4283d SHA512 1dd04a90487dd0f0266a77f72214ad195e4f463dc52eac5b2c6746b99654b0df14281fac639a047b6ade07394a01721369eafd846aaae94763a7897b7d3f3dd8 WHIRLPOOL f8e77873b146ed9ec97f614ac6feaac42e5a539a418460f7ade47b4a37cab20fce40564d8bf65ff6d5bc3a61ddf21727b9456b8dd21a7c1d588dfb39a52d9908
-MISC ChangeLog 60086 SHA256 af7b06612fdf084a978baa875256c6fd8a486d98e3026c482d05f4e888f124e2 SHA512 1ae38e51fb3aef3dd750d5d5ca7b170b33c73a8d1bfec73252115546df9e3c6ec20813cff6b15fbc0808dd9073b6a32441981d5996a02597b58190524acbb585 WHIRLPOOL 1c906b835429baa72623cdc5d418d60d031425e65488d681b497fcd8a96538192f48f350440b359093ba62e12e8db40811f1a2e1e2f2199e2eea2b783b13b626
+EBUILD db-6.1.19.ebuild 6746 SHA256 328dde8d834cbc3c3df7cf8c501056c5b4c577cf76a8bca48268161a9e9192cd SHA512 9c49dd1902026ce9083f87e8716b756dfbb5a1f03c53a2d101ef6b4db903407177c3a3cbd0411b59e3e4fec7f76b238f9e66e98b4777ecf14375cf42ab1ac422 WHIRLPOOL e32fd625c3592b921208f9dee2b49870459adb3b1a7b2ec82821f6b2c41102c14347ea2529f2f12087a420918cc951d007445ccbdf29dbf2ff748ff65266a5b3
+MISC ChangeLog 60301 SHA256 1766b0f2fd6754cd8bc5c94dd4bdc1251d1c40a0848f81b2f8ffb652516af4a0 SHA512 e008915f2c56b6d540ab20f87928e70f002a81334cbddd9df842cff2b15a9c84bd67881e81c712405310c0005d91d8f35fc5b87e662b0e490a2486e294d93993 WHIRLPOOL 3311eeedac170f53b607e2864e9421bdb5b8f1a940f086f328d6f9f889ee3dd1a765e248aa9cd0b4761b11b015ef340ea5930c118405f85db9f9bee656f30eae
 MISC metadata.xml 1231 SHA256 0aac93eb29b4674d00b215122f39eb1ec03248e105cab670bc1921cbcca1e927 SHA512 6d25e610cc6cdcba13f8ffaab19406ca9dd7b5eda0585a6666058408ef1eb23a062428483532f4d1461888039e49a97aad4afc6dceb96baa70b880f7c4cf59b9 WHIRLPOOL 1d6531dd2346d7bc02dd016688a58c1c454a9262c3bad846147a6bce51f3ab0aba11165782162a5fda678a1fae3bafcab0d57eb882d5450814ce4fa7b813de54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlTnWwAACgkQG9wOWsQutdaEkwP/RBY5xKsmgjHUDZFYkK4M18kv
-ucGkpX6wooDBSQUbQHuKQl1Ab8kEhlOAS5dB+4Adl9HNRihutnpdwRJiXLh5Y4AF
-5rCH9twoKCl7CX2LxdUv/tdrLAohn87gUquPTN3lGl40pIQKVnrrxgDEUYS+Hv7z
-uIXoaEaNz+tdcJD5TL0=
-=5sdC
+iQIcBAEBCAAGBQJVB2LCAAoJEPGu1DbS6WIAobAQAIipkm4W5KiGrnEDrvXrPhJM
++JNAaWj5HxMlOrQ3Fg7FmU3il2h+6/hxIXiqqKQKCs598LLccasAZuSVgFbVIFIR
++/WpMny3uS6MgziGwVOHwQG7EgSaUXUIGHOySrLM8QVsheDCiapOdizOi+H0sHcr
+cMQ9GyR+LuqdItiqz3H0i6slXu38YUw9n6+RdE3pXZUMW2o915mQkFFnYbMOzu1K
+56GGlp+5K2I68joAdOFwIACulof8G+FKGy3GKEnT7kzO+P8++kSMq6P3id/5ehlw
+/Vhe09iYxieEjmJ0vNPYO0nAp/8ITueAf21UYQIdJ6/P3mK0UjMXeWCKKbALUjOc
+pqkmQUy5lKlFvBoqsAKnDSMvqpBnC116Wbx9L2VeWFJqTKKvMyjMbZGnyQAJNGgq
+slkm17H599Dct0ofh74SYDikU08+rQLu8YGOemkHyQjMGsXGMD1V/WG7VhcR6Ivo
+b2cVvg4zTgHeLSzI2IndQn7BmG4XlsnSoe58R1jx8uOguaOdlXe4qAs4NbT+MSNy
+BC4NTdXE9pOOKz57h0rvQB0tsDBzadtqnELv8lKUh0e9VbZY4v565z1KJY8wAlsT
+Jbr8RXS2L2h2Z6ZJ/qPqrwDglmXNuI81w2MZ6LOcfvzXNUZTKrmIX9txeD2BE6UC
+mqtXAu/95j3SJVyC9DUf
+=9sYq
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r2.ebuild
index 220fa0543d03..489ef073291a 100644
--- a/sys-libs/db/db-4.8.30-r2.ebuild
+++ b/sys-libs/db/db-4.8.30-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.8.30-r2.ebuild,v 1.10 2015/02/20 16:05:58 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.8.30-r2.ebuild,v 1.11 2015/03/16 23:09:51 vapier Exp $
 
 EAPI=5
 
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -101,6 +101,8 @@ src_configure() {
 multilib_src_configure() {
 	local myconf=()
 
+	tc-ld-disable-gold #470634
+
 	# compilation with -O0 fails on amd64, see bug #171231
 	if [[ ${ABI} == amd64 ]]; then
 		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
diff --git a/sys-libs/db/db-5.1.29-r1.ebuild b/sys-libs/db/db-5.1.29-r1.ebuild
index de5794bdba7c..896edd3f5a85 100644
--- a/sys-libs/db/db-5.1.29-r1.ebuild
+++ b/sys-libs/db/db-5.1.29-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.1.29-r1.ebuild,v 1.1 2014/08/04 03:34:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.1.29-r1.ebuild,v 1.2 2015/03/16 23:09:51 vapier Exp $
 
 EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -97,6 +97,8 @@ src_prepare() {
 src_configure() {
 	local myconf=''
 
+	tc-ld-disable-gold #470634
+
 	# compilation with -O0 fails on amd64, see bug #171231
 	if use amd64; then
 		replace-flags -O0 -O2
diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index 9c146f95ea2b..2cfe377ba867 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.28-r2.ebuild,v 1.3 2014/06/18 20:50:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.28-r2.ebuild,v 1.4 2015/03/16 23:09:51 vapier Exp $
 
 EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -116,6 +116,8 @@ src_configure() {
 multilib_src_configure() {
 	local myconf=()
 
+	tc-ld-disable-gold #470634
+
 	# compilation with -O0 fails on amd64, see bug #171231
 	if [[ ${ABI} == amd64 ]]; then
 		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
diff --git a/sys-libs/db/db-6.0.30-r1.ebuild b/sys-libs/db/db-6.0.30-r1.ebuild
index 6525bbf7d3dc..ae645e3104d5 100644
--- a/sys-libs/db/db-6.0.30-r1.ebuild
+++ b/sys-libs/db/db-6.0.30-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.0.30-r1.ebuild,v 1.1 2014/08/03 22:03:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.0.30-r1.ebuild,v 1.2 2015/03/16 23:09:51 vapier Exp $
 
 EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -117,6 +117,8 @@ src_configure() {
 multilib_src_configure() {
 	local myconf=()
 
+	tc-ld-disable-gold #470634
+
 	# compilation with -O0 fails on amd64, see bug #171231
 	if [[ ${ABI} == amd64 ]]; then
 		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
diff --git a/sys-libs/db/db-6.1.19.ebuild b/sys-libs/db/db-6.1.19.ebuild
index 26a8177a0eef..7107df67b36f 100644
--- a/sys-libs/db/db-6.1.19.ebuild
+++ b/sys-libs/db/db-6.1.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.1.19.ebuild,v 1.1 2014/08/04 20:45:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.1.19.ebuild,v 1.2 2015/03/16 23:09:51 vapier Exp $
 
 EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -117,6 +117,8 @@ src_configure() {
 multilib_src_configure() {
 	local myconf=()
 
+	tc-ld-disable-gold #470634
+
 	# compilation with -O0 fails on amd64, see bug #171231
 	if [[ ${ABI} == amd64 ]]; then
 		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}