Updates from Jeroen Roovers <jer@gentoo.org> and Michael Weber <xmw@gentoo.org> to handle users using the gold linker instead of the default bfd linker more gracefully.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xD7DFA8D318FA9AEF!

3 files changed, 55 insertions, 32 deletions

diff --git a/sys-firmware/ipxe/ChangeLog b/sys-firmware/ipxe/ChangeLog
index 5a7e68d69748..8c8f45feb7e5 100644
--- a/sys-firmware/ipxe/ChangeLog
+++ b/sys-firmware/ipxe/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-firmware/ipxe
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/ipxe/ChangeLog,v 1.10 2013/06/28 20:58:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/ipxe/ChangeLog,v 1.11 2013/06/30 02:29:33 cardoe Exp $
+
+  30 Jun 2013; Doug Goldstein <cardoe@gentoo.org> ipxe-1.0.0_p20130624.ebuild:
+  Updates from Jeroen Roovers <jer@gentoo.org> and Michael Weber
+  <xmw@gentoo.org> to handle users using the gold linker instead of the default
+  bfd linker more gracefully.
 
   28 Jun 2013; Agostino Sarubbo <ago@gentoo.org> ipxe-1.0.0_p20130225.ebuild:
   Stable for amd64, wrt bug #475110
diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index a814dbd497e4..b51e042f58ef 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -1,28 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST e6427b7ee117ea4af0812bb13b57999bccd8e058.tar.bz2 2198003 SHA256 008a80b80a8b19ef6963581b5599880d51171aad13f96690589cbc0fa895eaf3 SHA512 8456ef3c27f3f4de827ae4c744cbe2eaacb96cf703a5525f490c53ac26ed597635acb744a50607d733d7bd5014dcbbb333f74da8fe68fddca19e11d047377d73 WHIRLPOOL 814cda89fa52afec2b1a8811407ce3b361c1d7548e40255fdffda2bd0fbb8485352575f19b6935de50582a97c31758cd9bcc2194cb2b222b89313868a032a828
 DIST ipxe-1.0.0_p20130225-09c5109.tar.bz2 2208235 SHA256 58fd3470c4807c7206550badbc709c9a48af201b4bfa629379143b21426189fa SHA512 74b72a336ee4874ee134fe2bfa8540a864ddd169e09a7d6dfa688624f674962ea33f01bb287b90fda0cdfe5bf4d38e49362934c22a2da932dd3e4c702ebd56dc WHIRLPOOL fad62b8d15bb67ab194954671ae9e1cfa0df06c2d237b9312994ecaf440f0bb22b72ba28824ee8a13c19fe90f8bd3b2847a80d93da5f10368b096cdfa8230a06
 DIST ipxe-1.0.0_p20130624-936134e.tar.bz2 2230605 SHA256 bbf9435515a481ab4e5bfc4e49d5eeb005b60169bad3db269e31228fafbb7bbc SHA512 8a1332794acd0db7bf485bfc2c1c52b4e7e5545e5cc1e4e39bbe6f190a684682613b063cc5c31c94d7715fa07555a851f04abb45e604325c0bb4ab73526df0c9 WHIRLPOOL 1338fc4f8bf69a98713d72ad0a8749bc53e42d99c8088e5536b78001d0f738dcc8aaa537cce7dcb5f4f66818880b936c964fc6bed8ff00e674cf400da9521f5b
 EBUILD ipxe-1.0.0_p20120905.ebuild 1736 SHA256 6f5fa565d43bee60cc94023f93e21cb5e5d2247d2740d477014ca70d13434429 SHA512 7ee3a59899941bb80cfbad7b0c09301bcd2b0fdc070382a77fa46972451b4abdd0a9085ff09231b18c69ffff6a94806845e149e7b1512bd52a91ebffd5f8fe6b WHIRLPOOL 3449f9f7a0e0c58de80adf05a02bdc1d4151a353e561c000b0ca4ba2c78bb51b3b447995db62cc82a67492712a13c2f68560c96da1ea558c0eac6a63e930ee3f
 EBUILD ipxe-1.0.0_p20130225.ebuild 1924 SHA256 b9b56fef99b2aab04462e281f934ea1574049c0e7a4d507a1ff8d496e364c08d SHA512 58b4cc37c8cc20fdd5a400bea8b4301501c97dcace20b5423aaa6301c3ac803de964e00d17d6b32d5a2340a41fed9dc630a152442051431b3e44bd46f4c3c956 WHIRLPOOL 459ad775d6e7b7449ca11003cea8cd507ca45592a5633e5bdb461e72c61364494d55c3f4dece26b1c3f5fc375ed3ab3707c63671e423afebe1bbfc1ecbc9d64b
-EBUILD ipxe-1.0.0_p20130624.ebuild 1808 SHA256 4340fe6b4643a342f0bfa6a9d5dcd225b50aa495dc20b7ef88e4efba941c85c3 SHA512 286bb9a21960d7565e8f430157b9fd3f0f2e4cf23004f5b4bf8db4843c77668a03ee7d4af048f2bd5e8632147445c21b1432ec3b517b48c839c5b1d8afec9ad9 WHIRLPOOL 8ca943a9bd5bb56ffcd5a40559101adb78520b4a9d0687dc71253dc922f8cb18cd8a82336576662b2019c74e3ec9c41eb1410db7ec1434751cafb4b96ac85dcd
-MISC ChangeLog 1774 SHA256 87eb68b09910ff500c17797b8cbb61722f14b60a7bb8bdd02f6f2ab5d4b09048 SHA512 ca71deb0e1717ff34139c84e73007070a130883a03fd15cc3013a1e77071468ead1b6370cdd12ed7b2ce8ecbd66d891080c42029e65faf9076563b4f1a7e28d3 WHIRLPOOL b63cb30a43dd25e54394e5d8fd4282cf5cb19ff8aaa9ed7c4f471f898360e2ce4d199ab969d13018a3771097d483db758da5caa92d9557fab88d97fab824ea11
+EBUILD ipxe-1.0.0_p20130624.ebuild 2340 SHA256 b402f4073f82cc33174f5bd5a06bfe5c33f4c539644d0f41c478b20781abe16f SHA512 c76d6b0ce5ac254526ce63cffbb6bea03a195972cdee9598107299ab5092ce1e12d6c5534ce8de35f66df054e82be3710e7169da98a7cf71eb306ea79921c503 WHIRLPOOL 50348f4b64f7c672d2d77a305b427600fbeca00e919540273935e5144633684f8518ef1edd61c3f450b029152a17ac5fb3c58e07012393a75ff34a71af0c2e7a
+MISC ChangeLog 2032 SHA256 91f3613a9992d9ee33922428ed3862220c2cd119d5c87401b3b877321a2c4b47 SHA512 5a8ade3149ed2b21926a90affb9c468e80053472672869b18cc6b1521c5e4fa16e303b57093f4db94e482824e13e3ede76f716a40439389b991eda0f38e03f48 WHIRLPOOL 836bb0598b2ce5490704307a0cba38db6bcb33584103dfd07beb8927116cc7bb945a6cd6f9c74a903a350f3a783c50387bab4e55e5b0fe87f8c4e84d3d46d471
 MISC metadata.xml 691 SHA256 f0f4dc35384ae2bbc0e938812ae3ec259c490e101fe978e2a7cc8ce8eb3d6a7b SHA512 1e1063f205a4a284224e229fa675f6eb83f03ee80c3874198740da15744961664c3f6fe0ec6c1211dcabfe1204bc92ec355b98075c5d626c3493bfbc7de08ae7 WHIRLPOOL 435dfad45383449b30a12b1caf484f05b39102d5132c9dd5573fddb84cfa2c987e6db700b0bc656e821cbc7fde5b04af5504fd367d665027b7eeef06853ff413
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRzfjeAAoJELp701BxlEWffUMP/RmKS1jwATOWKbQ8IkoVvT2S
-6kdiBXx82+2f/NAth5kw3cJ92Vtlul2IPxMsrvuRLk4A3fauAwxilpEvLY4x9AyG
-i3nPzbBV8Ab52c7K/U9yu3jMO38d0VOSiTFaTO+Isp+C8D5Ju83Je2UvwoYS0MSP
-0UQ+IVjiyJnu0ZPQCd+icsZGWgyvL2pANs7/c8BqQzAMAxY5Akb0n0Tt7uzpt4pY
-h8nb2VH4p8k4v+0CiE8P2+50ONNtRCstsn5Dz4gOvsEFpcc54Alr03ShdVO/Nb5y
-iDq9r5fLzTDHg5wMD76dUqEaeLvbGRBGFT+AL48KEHoZHEPeV7GCA11VIXwjndVl
-ZkFHGEzoee7XM7MGrt+ASM5k7Myt1hmgquxCQ6YbElb60DLAg9Kjh5d9N+1XuPGW
-/KKo/zSR8a1/8XSflrnU98ZOeIsqguffbBZ+fsvciRmr/4FqIHCgSKLmiCMn64Nm
-zkpzZ9Bm7MLKt/ank5gPpJCaIyjwHIRgBpmq6Wg+RxGpjbUIAl2IdG8BwRBVpQT/
-HZSWnxv2VjjQrxz/70t8jHYs6uktVju7YthxSWCsqo5NGseeVOMcVLKXO6QxVNQ/
-j275D3AhfIkf52t6x+IJLyx76FcT8jU52vtaBwz72E/EIY4NnvH2f3RG3cKKxLf+
-jeW3SwA82hK8JsAFb1VP
-=dpQl
+iQF8BAEBCABmBQJRz5gQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvvnIH/iPFmKSx6Ykcwg7cT31C1pd1
+TCnj7KZO61TC+kfaVMhM7IO6vm8BHRSLaOepIevRCBNUrB/FYAhRXvoRZYhY5jQD
++mhOX4mvP4yBv8SgRnv8VPihbisc+N2sXyjeE++ohQGdtQST8jq0Vf5FpQmp3oIS
+RXtklIKqWj6ImIdY9HssC/UTPVXTUtZtMhHaw27cjLJHFoC1anpk0n7LnohOQpoY
+D7BQaF9Nqtsy+WiWgA/2zjQUH0OUN2Ycj12bK9mkgX16oMljTZqrEEC0EtfTMc6q
+RnrP2XMxzBn141U3pCSoZFEFgXDYi1oQklAZG6392n4l+9NWaqSaCD18TcMzbgQ=
+=FNmQ
 -----END PGP SIGNATURE-----
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild
index b5aa7c81f70d..cdc456a73f32 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild,v 1.4 2013/06/27 22:18:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild,v 1.5 2013/06/30 02:29:33 cardoe Exp $
 
 EAPI=5
 
+inherit toolchain-funcs
+
 GIT_REV="936134ed460618e18cc05d677a442d43d5e739a1"
 GIT_SHORT="936134e"
 
@@ -27,6 +29,13 @@ RDEPEND=""
 
 S="${WORKDIR}/ipxe-${GIT_SHORT}/src"
 
+pkg_setup() {
+	local myld=$(tc-getLD)
+
+	${myld} -v | grep -q "GNU gold" && \
+	ewarn "gold linker unable to handle 16-bit code using ld.bfd. bug #438058"
+}
+
 src_prepare() {
 	cat <<-EOF > "${S}"/config/local/general.h
 #undef BANNER_TIMEOUT
@@ -42,27 +51,40 @@ EOF
 }
 
 src_compile() {
+	ipxemake() {
+		# Q='' makes the build verbose since that's what everyone loves now
+		emake Q='' \
+			CC=$(tc-getCC) \
+			LD="$(tc-getLD).bfd" \
+			AR=$(tc-getAR) \
+			OBJCOPY=$(tc-getOBJCOPY) \
+			RANLIB=$(tc-getRANLIB) \
+			OBJDUMP=$(tc-getPROG OBJDUMP objdump) \
+			HOST_CC=$(tc-getBUILD_CC) \
+			${*}
+	}
+
 	export NO_WERROR=1
 	if use qemu; then
-		emake bin/808610de.rom # pxe-e1000.rom (old)
-		emake bin/8086100e.rom # pxe-e1000.rom
-		emake bin/80861209.rom # pxe-eepro100.rom
-		emake bin/10500940.rom # pxe-ne2k_pci.rom
-		emake bin/10222000.rom # pxe-pcnet.rom
-		emake bin/10ec8139.rom # pxe-rtl8139.rom
-		emake bin/1af41000.rom # pxe-virtio.rom
+		ipxemake bin/808610de.rom # pxe-e1000.rom (old)
+		ipxemake bin/8086100e.rom # pxe-e1000.rom
+		ipxemake bin/80861209.rom # pxe-eepro100.rom
+		ipxemake bin/10500940.rom # pxe-ne2k_pci.rom
+		ipxemake bin/10222000.rom # pxe-pcnet.rom
+		ipxemake bin/10ec8139.rom # pxe-rtl8139.rom
+		ipxemake bin/1af41000.rom # pxe-virtio.rom
 		fi
 
 	if use vmware; then
-		emake bin/8086100f.mrom # e1000
-		emake bin/808610d3.mrom # e1000e
-		emake bin/10222000.mrom # vlance
-		emake bin/15ad07b0.rom # vmxnet3
+		ipxemake bin/8086100f.mrom # e1000
+		ipxemake bin/808610d3.mrom # e1000e
+		ipxemake bin/10222000.mrom # vlance
+		ipxemake bin/15ad07b0.rom # vmxnet3
 	fi
 
-	use iso && emake bin/ipxe.iso
-	use undi && emake bin/undionly.kpxe
-	use usb && emake bin/ipxe.usb
+	use iso && ipxemake bin/ipxe.iso
+	use undi && ipxemake bin/undionly.kpxe
+	use usb && ipxemake bin/ipxe.usb
 }
 
 src_install() {