Append to TARGET_LDFLAGS instead of replacing it.

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

7 files changed, 25 insertions, 20 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 5ec0086e5910..77703cc1bc43 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.350 2015/03/17 02:00:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.351 2015/03/17 02:07:08 floppym Exp $
+
+  17 Mar 2015; Mike Gilbert <floppym@gentoo.org> grub-2.00_p5107-r2.ebuild,
+  grub-2.02_beta2-r3.ebuild, grub-2.02_beta2-r6.ebuild,
+  grub-2.02_beta2-r7.ebuild, grub-9999-r1.ebuild:
+  Append to TARGET_LDFLAGS instead of replacing it.
 
   17 Mar 2015; Mike Gilbert <floppym@gentoo.org> grub-2.00_p5107-r2.ebuild,
   grub-2.02_beta2-r3.ebuild, grub-2.02_beta2-r6.ebuild,
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 5517dc61d762..d3589bc934c1 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -19,17 +19,17 @@ DIST unifont-5.1.20080820.pcf.gz 1379965 SHA256 122b9c470f29b70223b0e07404a6dfa7
 DIST unifont-7.0.01.pcf.gz 1358916 SHA256 7618a96ad50703213848af8ecae816828f528bb8ed179a749f7ca2b86eb15805 SHA512 f985e11729d18cb16d3e46fd1004242aa731a9b03ba16035f5954076686e8cdc39df9087daded5e044ead995b03650d8cf1bba9d060d65b5c3af630dbc9e3260 WHIRLPOOL da682398a22abd4282674d9a79b8fdd53e03054863cc166e43e2640dfb7f11c0b71cd3e42431f2086692f3a4202c2ecae9d6d7126249db0127e2da276aae7c9f
 DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
 EBUILD grub-0.97-r14.ebuild 9607 SHA256 caa3c3576ba47be94412023b1d6890ebf143c1f118ffa5526366bca09e3de13f SHA512 f8ddb971b37abdd2254071c663902101cc0d5049cef21341118ab57d203ba756476e1084b792d030bbb5e04251f28633a3e3c942623cb16148dd0970d6cd7e11 WHIRLPOOL 266080e1f8f4f6abce96d6bd3fc5727526a860bc571ca640b1a28dc5a3c0d963b734cd9cdbe010d1f3e03a40e4f5a986addf88cd9d13b68256a1ee1c7e9f8552
-EBUILD grub-2.00_p5107-r2.ebuild 7820 SHA256 a69169267c1b03ae8213bf128e187ca0acbb3b44261495e85f52432d709d9667 SHA512 fb7e002d424ee677f0337bb1efa88d83cce997f7491bab1c5dd7ade91809ea6bcc3a22de3587cf0d2c0b8231c6d0001a430bd0a042bffff8ec646ef9e82f196c WHIRLPOOL 6954c10bebcbf7c5e695375d0b9f03208b0c7274cf72b62ce5baf85a7a72338ae5bde000fb0936068234a0afd114f4d33e40d24844212ca795ff40b3677f2205
-EBUILD grub-2.02_beta2-r3.ebuild 8032 SHA256 f269a4b4c652d48b9c768a3c952d107336a62e9bf983bd4de74b1f0ffd04b767 SHA512 ed25e5904ef91178e5a56914305e987f680e1e9adbeffc72a44b9f4b51ced8b27e2cc908c416a7b6ea5abeeff52be39e59cf023c6938715d37c5ec033e727dee WHIRLPOOL eaf5298686aebf74fe678eeb9fe860c84acbc28e0ff74f8d833a8267f12a750eccc402f4558ae0be4592b243ef1cc306f2ba5a4d50ab754ad4ef4211f7019399
-EBUILD grub-2.02_beta2-r6.ebuild 8280 SHA256 7d3e08a38dc8b49aa05e23ad6ef74eb25a272a9c29c33e949a41261640540179 SHA512 9a70c845d0ba0afdbc3ca7e1c37bf5d5c6903e75e3370bb6c45520671a8e568bcc759d949b80dbc771c7ec8543dd5f7b044c4eb0628474fb77e045c3e7f966b4 WHIRLPOOL 98465baab70e4af4f749dec038c60bebc0654c9136de94cf9044966bb0c44a256817b6e3ab6ed50e546645f5eafd04bc72b29df32a062736f4c428e714b68999
-EBUILD grub-2.02_beta2-r7.ebuild 8359 SHA256 0a860feb0c6e6a46dc84229d6e3963345cdcf64920bc6892a351b30ac8e9352c SHA512 4129aefd3764153cf1113caf1bcd836bad6b6315dbf1668379f7a8e2d2d65799b15a0d36d1849f6e19f49cee654eb1fa939440fc77db0ef64c1c714c4b42b097 WHIRLPOOL 83da1f70e89c15cfb8701ad60c3c50cf55c4d7331d3df1f2983c8be5d4f9eae19379b910ae47ee91f9d468ae2ccdad7cfe6a877e29217dcdf2cb2ef0b6ab83c7
-EBUILD grub-9999-r1.ebuild 8065 SHA256 9d8f9cafc7112079d51674b9e5ca3066ae7b9883f0efe67f8a6b4b41d1d91cff SHA512 45914d818a25ae1ea388947726e769fdbaa710e129128be94be2569ef9b92feadc0086c04c2eaff9133448069a676a2b8993395979ba43aa4ba7561b70ec8abf WHIRLPOOL 9f6305c995a25fbfed90ce6a12696abfab91e12e91c2087842951d37f1a7a647d880ee49a599d830deb483345b26df26617b6e3e17d1820de51e64e8c175585d
-MISC ChangeLog 67084 SHA256 41a2cc77faccc73cac6560fad842aa1f7ba5e5e29b5fdb64fbccffcd3d1b7963 SHA512 0aad94fc04f82a41756a1178c85248e67492aa15178ad25b5af5f4e06ed0e2916413d4e4ddd7a5f2e7e3bbdf44a4c715a74993b22729215046fcb8ef412d17cd WHIRLPOOL af2d952a37cb299f271825999147906e32d97d8646e7f9228c0c45a5b0e75874a1df5761311f3e52c378fe54a4541c01ece66a8f302be46b7ec92d71d36a6a77
+EBUILD grub-2.00_p5107-r2.ebuild 7824 SHA256 674c0cebcbbdfde8e81a4a5e0d6451bcd439db1949a80f73e22160231db2c70c SHA512 69e5a9af3df1152e76cfc0e02f7c8d5497710ac2c7b78c55ac920d3ed224269623f53a8109ecc76afe80783604e18f0d6dfbd5205d6f4be17245b241dc7a1595 WHIRLPOOL fed9d1fa38481c7994057183da9e26e7ffef91234183d9210758c3e0a3e5ac16856ae57ed00b0d7d86569624dd7c40a29cb61e9920d16e3cf02836046e691cb8
+EBUILD grub-2.02_beta2-r3.ebuild 8036 SHA256 042c9e1658089f63861046df3960486a9d17c7824bb303e5145411040dde455f SHA512 fe88066444d98a941d9f20ab9b2e3b800e93f33284a98d5bc9b3a24785141d1ea8257fc8fd649e6ff820ef7441564072d083b00d21409d4364c44dd09d6c9229 WHIRLPOOL d545ec1fba32063e92547101bc91da6e759f834be8f89f33e2385dbecf8eaeef93f681e95a0560fda05ebd08ba185634c9b0fe53a65eb801a291d84a95bc101b
+EBUILD grub-2.02_beta2-r6.ebuild 8284 SHA256 886077b9af10ce6a7d03c6590b00105ccb73cad08baf24ccc162da560e81e722 SHA512 e1fca4b5fe6f38cbe89d29d0ee73160c5d58f1fe23191692d1463084c442fddc9c12ffb4c3d9a04016c8c5f661e3afcb29d692cd46703493c8d27b2ad3ed8a7e WHIRLPOOL 9016f5b161773cf9f3b012111e2b009d895488a27ee981484f12ac180b66a798251545ea658f24895ff0333ec9efa1c9f21b57e3ea70105d31ad4702563c4cbe
+EBUILD grub-2.02_beta2-r7.ebuild 8363 SHA256 3753b5eb7b4faacc2190c31017cf10a98c620ffee84e7fad39f7e78bbf575c65 SHA512 b1a521a273e48bd44444df087213459dfb7c52da27d1b1aa3fc9d81bf078c30c885aaa9af5f2b201c457c2966245f0cb7950f9ed158381dd85d35e6d38baca4a WHIRLPOOL 778d7b37617cadd1b0216e735b8a670dfe5dbfd45573a45325a1c03f240e23577a945e73d4e38d207bd776324d2d2a4738b59e195e839db12f5075593b34ddb2
+EBUILD grub-9999-r1.ebuild 8069 SHA256 253434774bb17eb219693af82da56f1ee223b0b297ff11599246b56bc34d4738 SHA512 1509134f80deff9d21ce0d86119137aee4e3e34de241ab089ef28ad987c7f20121a1a3c22b68b0eb6c7ea5747ee49dc944fc6a97b0dfc26bd2e5a8aba2434de6 WHIRLPOOL 5b96f0ae510b9b666d39a65e85785307e01f5326498b06ac829491b439c1aa8b9deb6e8d12814e1fbf3c52d28ce234bd3730faba56102acf3982a23c39f4e596
+MISC ChangeLog 67319 SHA256 4f2fb752db3c6270cfd5f1cde6c21680d482c2fb3712b846d43ab2c9952a43db SHA512 f7f75dd0766e3ea30bff4c30b3630ebb1a3a8722f4af638ce3a16f1cb22f424b2445aad9cabdcc0e37260de033ce41f8717df122bfd4c38b63105f721fc9bc4d WHIRLPOOL d2b8fb05bf9d0d1fc9efcbad260ded4aefb8dbffbd6d6d029c4cd5eafb4bb36d7227108139714196fd39410c91f9294bbc3c1dd0b2872042f44ee0f37cf342fe
 MISC metadata.xml 1099 SHA256 11bf295d5e9c29b235f08aee8426c0bed0d13e784242d9a0ed85a8785418c0fb SHA512 ed5ba243b98e32e0f4aa7bc7f116219add21bc2d4a60e38df6681cbdc9f4894507f6bc94d6092af777d5020c6a93ac6e8b5088e291b80b2a92294b4a8b69e121 WHIRLPOOL 07ac627189c56533d3484cd318610a18dde5cf732959fcbc405873a5146de96a49d8b29f6e2c2ec15fe62b561952361a4e0092aa17b744f761a500a40245c8fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUHiqwACgkQC77qH+pIQ6SlXgEAyI2s1hl+O+0p+vLec7xCaqpi
-Cly1et1/USfKfNAO0+YA/i1g/uPAy/3sWnd5hLMUkdI11aAwDK9pje0RybFs5nXq
-=cG2K
+iF4EAREIAAYFAlUHjE8ACgkQC77qH+pIQ6STkgD+N4aG5COVFWFAN7myl07aNtDC
+Bp5n1iBEa/fe8nj7+e0BAJa4X6mrZKGhooUbknm9w/ZnDHlaHi3gY/AZDlOtowmT
+=oxtU
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00_p5107-r2.ebuild b/sys-boot/grub/grub-2.00_p5107-r2.ebuild
index 719d25a0ed1b..b65c24287224 100644
--- a/sys-boot/grub/grub-2.00_p5107-r2.ebuild
+++ b/sys-boot/grub/grub-2.00_p5107-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_p5107-r2.ebuild,v 1.11 2015/03/17 02:00:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_p5107-r2.ebuild,v 1.12 2015/03/17 02:07:08 floppym Exp $
 
 EAPI=5
 
@@ -222,7 +222,7 @@ src_configure() {
 	use static && export HOST_LDFLAGS="${HOST_LDFLAGS} -static"
 
 	tc-ld-disable-gold #439082 #466536 #526348
-	export TARGET_LDFLAGS=${LDFLAGS}
+	export TARGET_LDFLAGS+=" ${LDFLAGS}"
 	unset LDFLAGS
 
 	tc-export CC NM OBJCOPY STRIP
diff --git a/sys-boot/grub/grub-2.02_beta2-r3.ebuild b/sys-boot/grub/grub-2.02_beta2-r3.ebuild
index 93c4970113ec..12142e1173f5 100644
--- a/sys-boot/grub/grub-2.02_beta2-r3.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r3.ebuild,v 1.7 2015/03/17 02:00:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r3.ebuild,v 1.8 2015/03/17 02:07:08 floppym Exp $
 
 EAPI=5
 
@@ -237,7 +237,7 @@ src_configure() {
 	use static && HOST_LDFLAGS+=" -static"
 
 	tc-ld-disable-gold #439082 #466536 #526348
-	export TARGET_LDFLAGS=${LDFLAGS}
+	export TARGET_LDFLAGS+=" ${LDFLAGS}"
 	unset LDFLAGS
 
 	tc-export CC NM OBJCOPY STRIP
diff --git a/sys-boot/grub/grub-2.02_beta2-r6.ebuild b/sys-boot/grub/grub-2.02_beta2-r6.ebuild
index 385938949400..738aa76db3ac 100644
--- a/sys-boot/grub/grub-2.02_beta2-r6.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r6.ebuild,v 1.5 2015/03/17 02:00:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r6.ebuild,v 1.6 2015/03/17 02:06:52 floppym Exp $
 
 EAPI=5
 
@@ -237,7 +237,7 @@ src_configure() {
 	use static && HOST_LDFLAGS+=" -static"
 
 	tc-ld-disable-gold #439082 #466536 #526348
-	export TARGET_LDFLAGS=${LDFLAGS}
+	export TARGET_LDFLAGS+=" ${LDFLAGS}"
 	unset LDFLAGS
 
 	tc-export CC NM OBJCOPY STRIP
diff --git a/sys-boot/grub/grub-2.02_beta2-r7.ebuild b/sys-boot/grub/grub-2.02_beta2-r7.ebuild
index 0719627cb423..a6d15edc1e96 100644
--- a/sys-boot/grub/grub-2.02_beta2-r7.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild,v 1.8 2015/03/17 02:00:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild,v 1.9 2015/03/17 02:07:08 floppym Exp $
 
 EAPI=5
 
@@ -245,7 +245,7 @@ src_configure() {
 	use static && HOST_LDFLAGS+=" -static"
 
 	tc-ld-disable-gold #439082 #466536 #526348
-	export TARGET_LDFLAGS=${LDFLAGS}
+	export TARGET_LDFLAGS+=" ${LDFLAGS}"
 	unset LDFLAGS
 
 	tc-export CC NM OBJCOPY STRIP
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index c6a79cbcc2b7..e4e989ad9891 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.31 2015/03/17 02:00:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.32 2015/03/17 02:07:08 floppym Exp $
 
 EAPI=5
 
@@ -245,7 +245,7 @@ src_configure() {
 	use static && HOST_LDFLAGS+=" -static"
 
 	tc-ld-disable-gold #439082 #466536 #526348
-	export TARGET_LDFLAGS=${LDFLAGS}
+	export TARGET_LDFLAGS+=" ${LDFLAGS}"
 	unset LDFLAGS
 
 	tc-export CC NM OBJCOPY STRIP