diff options
author | Roy Marples <uberlord@gentoo.org> | 2006-06-02 09:01:27 +0000 |
---|---|---|
committer | Roy Marples <uberlord@gentoo.org> | 2006-06-02 09:01:27 +0000 |
commit | 39e260d475d1f0544c05eada5a8029a112012bf7 (patch) | |
tree | 5b6bf80acfb70d550e721862fd921e7eb7d36bb2 /app-emulation/xen | |
parent | Mask cyrus, used by dspam and dspam-web. (diff) | |
download | gentoo-2-39e260d475d1f0544c05eada5a8029a112012bf7.tar.gz gentoo-2-39e260d475d1f0544c05eada5a8029a112012bf7.tar.bz2 gentoo-2-39e260d475d1f0544c05eada5a8029a112012bf7.zip |
Send raw LDFLAGS via make to support --as-needed, #135140
(Portage version: 2.1_rc3-r3)
Diffstat (limited to 'app-emulation/xen')
-rw-r--r-- | app-emulation/xen/ChangeLog | 5 | ||||
-rw-r--r-- | app-emulation/xen/xen-3.0.2.ebuild | 19 |
2 files changed, 14 insertions, 10 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/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 } |