Add pkg_pretend check to bail out if we are using the gold linker. Bug 439082 by Ambroz Bizjak.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 36 insertions, 13 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 981925b1ba1c..4fe1fa45a918 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.240 2012/10/18 12:41:14 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.241 2012/10/20 21:46:34 floppym Exp $
+
+  20 Oct 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00-r1.ebuild,
+  grub-9999.ebuild:
+  Add pkg_pretend check to bail out if we are using the gold linker. Bug 439082
+  by Ambroz Bizjak.
 
   18 Oct 2012; Christoph Junghans <ottxor@gentoo.org>
   +files/grub-2.00-hardcoded-awk.patch, grub-2.00-r1.ebuild, grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 39b0d5c55ad4..a9b2e72e2094 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -55,19 +55,15 @@ EBUILD grub-0.97-r8.ebuild 8948 SHA256 3eb9b11beeae64c986c9d27233f79525f271d0362
 EBUILD grub-0.97-r9.ebuild 9053 SHA256 b6411eb5c379cc6b9120f1f727733d9724c4257405c3a7a1935b2aa573085726 SHA512 ddcf78c3d72f1bd854ed44753f4870fc9efd0cf69a28efb24423863c6ad740657affa74eff403484b4f30046e338d4a506a71e5d6b1818022377a1a77880b004 WHIRLPOOL 13d3adafd3814259081dd783067c077fbaebfa2974214d5b0249c818aa3cc004cb2bd526b18f1c1a46dfc0641325a92b87c8f73608972061c52c7ded99e95fe0
 EBUILD grub-0.97.ebuild 4238 SHA256 d93dd5dca80c822e0659007b827966fb69c7f702b13ba672b4c3f486af54cee1 SHA512 46d72cfaa5735d0b3d2d89a8e6ce83745e4645370cdbbfcffc37d1413ffeb2b1caafac8c7cc712925ffc09411870b06467eb50bc475997508e7beea8fa5172d7 WHIRLPOOL 4b6fe9a7300baf6364555858a49ae2775ea0da27291d5d48fa634097531ae3b6da445ee2f959ef584bf4c913aad5e689b77e7326af257549ef107704dc0d202e
 EBUILD grub-1.99-r2.ebuild 8413 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c59e739015dc949a51011f585 SHA512 520bd623cfaf70451b4331f2dc464982f4de1b0c070ee8c0b336c9d16589aaa96924ea923f4c47ccb07d3c8f6da987a89ed285f1f4fa8f922465ab912e8940bd WHIRLPOOL 5abb91bf54a5024b225e7c3891b884827b31e6e8e380db9aa37fd520c55cd2e94ce1e7545271d52a58baab63446906cb69440177a4678000ac519088b9ae6966
-EBUILD grub-2.00-r1.ebuild 8301 SHA256 15a7349ebb9d3a06589bc97b031aadba0ec58deed069e2395586fae3c3905ebc SHA512 28682c26b22f7426f00bfb1e5402d3558e7ef1d0ceffec82057e5b6cf5c5d0fae9a34446f1ff9a181a97c2ab93017be19339c06ad87d52a1f68c0f485da8fb6a WHIRLPOOL 7de21f98c29c9db4c3ff8fc221da827db02a441a2eef0a7d2b2ca76c1bcf39fa4639b7a9384193362bac8ef81b9b58082c5de36f934eb5e2a5adddaebc9a4333
+EBUILD grub-2.00-r1.ebuild 8607 SHA256 10f2c1982212c11ab279924387710e20093c0ce8c71c8126d8cb587fb7dd3f9f SHA512 9d02c3786b4b8d5a97b0b2164e5b456d1d4ddeeb8fceb5472914ffde45b22fbec0509f3f3a040ba90fee8ee15f9400f93e736116288c6c1f6a6a9db3069d28e1 WHIRLPOOL f2601985198648a4b179e24bf6c99e80cb064a93ab1a10afa57c4d96da6b12181ff21931200bf70afbc384673f4034bc3931c89e0b3e09f266e7dd3e044f8300
 EBUILD grub-2.00_beta6.ebuild 7140 SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68 SHA512 35b5a7aa5224ba1f0d3dabaeb03d915b86a3c16419f6ef012c8092b198e8bbc054f22e4658930f704402066622b98c67c869f0c9cf5d74637c34ae786b0861fa WHIRLPOOL 54839cae4be956d12f8c62524923e9087f76c5e2c3c7db7cca074084deba71cd870238e514227a73a1131748fac501566afe29866231b68e4bbddbf2b465a71b
-EBUILD grub-9999.ebuild 8299 SHA256 36163c18a2083b7d165f1581258eb90e31387f1ebb4aaaec2e281a5b4dcf3e8f SHA512 1d666d567a0b03dc1a0fa9850602fdf21b5718acceec537a2219e8f72fe310588d7bf01626226448b1037ad0507afa6c50f22786ab950c93f92a6d7a2755d706 WHIRLPOOL f159ba7c1743d341fbbdbe91e2eb0989205cc8d22eaf195f4d96a032acbdb93333fa902c98276c33fee34081c649c7622c9e285adc05e2091f4d9dbc7646f133
-MISC ChangeLog 46862 SHA256 258c9d87d80f2036ec27544051e720b42846bf58c1a665056a274957607c90d7 SHA512 5a986d04e4614c140edc145c283c3005816c7709bddc04f5828bb605dbec1b941964af2a1ded70001a4f427d3fa4e8f582ecedcff2ad911ad572789602b45ae1 WHIRLPOOL c582f49ed16ac6e7f7cb834a99d5a727dd3e9e95a20d1cb1294856ed10a243ef85798fa674a958d6f81550511c1c67c7ef07a9df82a34abb6b9d3b9d957e951a
+EBUILD grub-9999.ebuild 8605 SHA256 506e79cb8de178641162809a15b2656d771af197cb8bc4dbe83754ac99234cdb SHA512 3dcda4d909ab6f37e9e9db5951d4bad076b42e6a38a5e28431b7e5cd801c2c3e569966a5a16ce6031acec03a05005ac8dee1c5a12305fac88e38c3554afa68b8 WHIRLPOOL da73ca55e91e5e303e5f0254197722a0ff05ef223d5fc70305d6d215ef36879232350734b7c92851608989ae97d4e3c71bedb6e64557f2b93b98ac47655483f2
+MISC ChangeLog 47054 SHA256 b5c3f047c14ba60d1ec8e758b3a4da3934f8ba00cfb11067d6ae6b0d88d14ae4 SHA512 2ffda0b738146bf480fdb4e1479770c463d3e73711f3b535475bc4d624de6478c90de8ee19bd24f6d644778c2a631e3a8851b54c54063a988245fee2e3738f01 WHIRLPOOL dc697fa2e21484a61a5cf6509b280e76fe7d216f03a18a0f1db361eb820c6d79176fa51f075dae28e57e513d285235a84b1d9ae764b2f68e1316745e50e44be0
 MISC metadata.xml 683 SHA256 f2c66324ee4e6c4afd16d412888a9dc73227058546f5cb7dab89a3b110f5a2ab SHA512 fa9e843cf2ec3b240720a2b3167d05067810f0380ab5e7ebde7a96235562d926f1f25b7e8c4c150e98801d05051ab961d216efc9bc9a59a0b425245f78d96119 WHIRLPOOL fba7d83b868b2fa9821882b0948d67fead33e7b76c7384763a971f390bfb5c4c325b3de039df55a5ff09f4c58d30a67daf0fa7653b1ab5a1546ee4295d9c8f00
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQf/jsAAoJEOeBhlrCAAWGWdgIALEtEPflPgc8vSdxKzhZ/rL5
-7yBNxV+DNDrkfPMCGo5zx5PYJLquZaQZNbzccRkq8cN5xbfLTOigMjHdTqbhGXsA
-QaMCArulOKX0ftHtAX4JMp9Wxq3n32BqRYKLua4ObJsAgVT+bqbZpWOFwFOranuW
-5sLwUPwnpg8bnQHprt3VNm9khY64kL3PCAg7wj6n3X152bhvvBpLlsRena5jxx8m
-yrYHL8UKocOCCr40rniC7hLDvOyS0XP6Zoc+0TqjHV7vlCYUI1xhbegGZn+nBLn/
-kO2y6ItF3j1boGHY15X80wuQriZMEQGB/Vl8ZEyDNL/5evX+LYkZoCWHbEl8GWM=
-=B3kg
+iF4EAREIAAYFAlCDG8AACgkQC77qH+pIQ6TcAwD+OSomta5+HNo9YwwL9n7vtXJf
+KW0bfwQ6z07V00N34tIBALWMN4Czbua2aJuBjSVTgIY++4GdItQuh8Rapcmyx39r
+=nrQu
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00-r1.ebuild b/sys-boot/grub/grub-2.00-r1.ebuild
index 9f7a6becacc6..15eee11c8010 100644
--- a/sys-boot/grub/grub-2.00-r1.ebuild
+++ b/sys-boot/grub/grub-2.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r1.ebuild,v 1.2 2012/10/18 12:41:14 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r1.ebuild,v 1.3 2012/10/20 21:46:34 floppym Exp $
 
 EAPI=4
 
@@ -216,6 +216,17 @@ grub_install_docs() {
 	emake -C docs DESTDIR="${D}" install-html
 }
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug 439082
+		if $(tc-getLD) --version | grep -q "GNU gold"; then
+			eerror "GRUB does not function correctly when built with the gold linker."
+			eerror "Please select the bfd linker with binutils-config."
+			die "GNU gold detected"
+		fi
+	fi
+}
+
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 31ca532cb99e..db2e902b8407 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.84 2012/10/18 12:41:14 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.85 2012/10/20 21:46:34 floppym Exp $
 
 EAPI=4
 
@@ -216,6 +216,17 @@ grub_install_docs() {
 	emake -C docs DESTDIR="${D}" install-html
 }
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug 439082
+		if $(tc-getLD) --version | grep -q "GNU gold"; then
+			eerror "GRUB does not function correctly when built with the gold linker."
+			eerror "Please select the bfd linker with binutils-config."
+			die "GNU gold detected"
+		fi
+	fi
+}
+
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		epatch "${FILESDIR}/${P}-parallel-make.patch" #424231