Send raw LDFLAGS via make to support --as-needed, #135140

Package-Manager: portage-2.1_rc3-r3

3 files changed, 23 insertions, 19 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index f9403c6fa150..a7e0f679bcbd 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.37 2006/05/22 16:00:27 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.38 2006/06/02 09:01:27 uberlord Exp $
+
+  02 Jun 2006; Roy Marples <uberlord@gentoo.org> xen-3.0.2.ebuild:
+  Send raw LDFLAGS via make to support --as-needed, #135140
 
   22 May 2006; <chrb@gentoo.org> +files/xen-3.0.2-nopiessp.patch,
   -xen-3.0.1-r4.ebuild, -xen-3.0.1-r5.ebuild, -xen-3.0.1_p9029.ebuild,
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 59dc88d29568..82f33fceea9a 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -22,15 +22,15 @@ AUX xendomains-init 1671 RMD160 e2dbb7b4da5ff8be60532e5a393988f47f28c036 SHA1 91
 MD5 a3c0c26c30ce1271b439661b68ca9e74 files/xendomains-init 1671
 RMD160 e2dbb7b4da5ff8be60532e5a393988f47f28c036 files/xendomains-init 1671
 SHA256 19aac7da0ba103ae800ed10b7d151912b3a9476edf63c3651073a197ea291e49 files/xendomains-init 1671
-DIST xen-3.0.2-src.tgz 4933621 RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951
-EBUILD xen-3.0.2.ebuild 2491 RMD160 61d8a1ddd94d18c9693496a65421fd16e2e4b767 SHA1 774730b5fd219f796f0f30cc32f51dbfd1c2f9a3 SHA256 f6162fef9aeb9938e7d3fe01c909d55db889605ea5146c894f6ae19142881541
-MD5 34a03ee98e719f76e5ed65c71e8361df xen-3.0.2.ebuild 2491
-RMD160 61d8a1ddd94d18c9693496a65421fd16e2e4b767 xen-3.0.2.ebuild 2491
-SHA256 f6162fef9aeb9938e7d3fe01c909d55db889605ea5146c894f6ae19142881541 xen-3.0.2.ebuild 2491
-MISC ChangeLog 6196 RMD160 964813237fb890d634a30546c9a521d9f48a20b4 SHA1 9916d66a8d4c7d5ff03e7714a13119ca60ef4ac2 SHA256 47f53dc9b2d5747362477fc805b7b9fab60e8f82b45b70b5d85cdaa69bfbc000
-MD5 f6d68ef328c1b2f4196a2dc8da5a7bef ChangeLog 6196
-RMD160 964813237fb890d634a30546c9a521d9f48a20b4 ChangeLog 6196
-SHA256 47f53dc9b2d5747362477fc805b7b9fab60e8f82b45b70b5d85cdaa69bfbc000 ChangeLog 6196
+DIST xen-3.0.2-src.tgz 4933621 RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af SHA1 b7e797048b516f8b385afd3da9ae2eded1b8033a SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951
+EBUILD xen-3.0.2.ebuild 2580 RMD160 b98a1273ac5665d83ee4a36b76e5ba8f15246e8b SHA1 900b1ba27e2e56b8b66bf1c6c3a04e4196793ba8 SHA256 460c88e0b3b83fe207b23a9f7d1845074866c365c83fcd50f66eed857d934d2d
+MD5 db3c4220ffaae111126ad9bbad612471 xen-3.0.2.ebuild 2580
+RMD160 b98a1273ac5665d83ee4a36b76e5ba8f15246e8b xen-3.0.2.ebuild 2580
+SHA256 460c88e0b3b83fe207b23a9f7d1845074866c365c83fcd50f66eed857d934d2d xen-3.0.2.ebuild 2580
+MISC ChangeLog 6328 RMD160 157608e5f866b365ad0196738ac7ba176790cf0a SHA1 490b7467d1033b7e4d2fb94381f2b773f46c24c0 SHA256 ba95e5914366c8a041195d16aaa683078e442dd0b9a6a22d4e2f353f3fdb1e92
+MD5 4d57b7652c9151107fd9fc2bd1407efb ChangeLog 6328
+RMD160 157608e5f866b365ad0196738ac7ba176790cf0a ChangeLog 6328
+SHA256 ba95e5914366c8a041195d16aaa683078e442dd0b9a6a22d4e2f353f3fdb1e92 ChangeLog 6328
 MISC metadata.xml 340 RMD160 1e505cf59523843b2a5172e50c9c79f4023c6c54 SHA1 4aea63139fc1e9b5f91de64d99905b97517ebcd0 SHA256 1f3de54b689b51f835575a577ab5fc233e54b555dbee2b76b4b6b432c30dda2f
 MD5 f68bf4749b57b06634857aa467b4c813 metadata.xml 340
 RMD160 1e505cf59523843b2a5172e50c9c79f4023c6c54 metadata.xml 340
diff --git a/app-emulation/xen/xen-3.0.2.ebuild b/app-emulation/xen/xen-3.0.2.ebuild
index b65a1f50650a..bea1e5d45ee9 100644
--- a/app-emulation/xen/xen-3.0.2.ebuild
+++ b/app-emulation/xen/xen-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.2.ebuild,v 1.4 2006/05/22 16:00:27 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.2.ebuild,v 1.5 2006/06/02 09:01:27 uberlord Exp $
 
 inherit mount-boot flag-o-matic
 
@@ -9,10 +9,10 @@ HOMEPAGE="http://xen.sourceforge.net"
 if [[ ${PV} == *_p* ]]; then
 	XEN_UNSTABLE="xen-unstable-${PV#*_p}"
 	SRC_URI="mirror://gentoo/${XEN_UNSTABLE}.tar.bz2"
-	S=${WORKDIR}/${XEN_UNSTABLE}
+	S="${WORKDIR}/${XEN_UNSTABLE}"
 else
 	SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/${P}-src.tgz"
-	S=${WORKDIR}/xen-${PV}
+	S="${WORKDIR}/xen-${PV}"
 fi
 
 LICENSE="GPL-2"
@@ -29,7 +29,7 @@ src_unpack() {
 	if use custom-cflags; then
 		einfo "User wants their own CFLAGS - removing defaults"
 		# try and remove all the default custom-cflags
-		find ${S} -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
 			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
 			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
 			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
@@ -38,8 +38,8 @@ src_unpack() {
 			-i {} \;
 	fi
 	if use hardened; then
-		cd ${S}
-		epatch ${FILESDIR}/${PN}-3.0.2-nopiessp.patch
+		cd "${S}"
+		epatch "${FILESDIR}/${PN}"-3.0.2-nopiessp.patch
 	fi
 }
 
@@ -54,19 +54,20 @@ src_compile() {
 		unset CFLAGS
 	fi
 
-	emake -C xen ${myopt} || die "compile failed"
+	# Send raw LDFLAGS so that --as-needed works
+	emake LDFLAGS="$(raw-ldflags)" -C xen ${myopt} || die "compile failed"
 }
 
 src_install() {
 	local myopt
 	use pae && myopt="${myopt} pae=y"
 
-	make DESTDIR=${D} ${myopt} install-xen \
+	make DESTDIR="${D}" ${myopt} install-xen \
 		|| die "install failed"
 
 	# for upstream change tracking
 	if [[ -n ${XEN_UNSTABLE} ]]; then
-		dodoc ${S}/XEN-VERSION
+		dodoc "${S}"/XEN-VERSION
 	fi
 }