diff options
Diffstat (limited to 'app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild')
| -rw-r--r-- | app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild index 558bbb328edb..1843398e3510 100644 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild,v 1.3 2013/02/10 08:20:23 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild,v 1.4 2013/02/19 20:20:56 idella4 Exp $ EAPI=4 PYTHON_DEPEND="2:2.6" @@ -36,8 +36,28 @@ pkg_setup() { python_pkg_setup } -src_prepare() { +retar-externals() { + # Purely to unclutter src_prepare + local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz zlib-1.2.3.tar.gz" + + # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative + sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \ + -i "${WORKDIR}"/zlib-1.2.3/configure + sed -e 's:^AR=ar rc:AR=ar:' \ + -e s':$(AR) $@:$(AR) rc $@:' \ + -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} + einfo "zlib Makefile edited" + + cd "${WORKDIR}" + tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz + tar czp grub-0.97 -f grub-0.97.tar.gz + tar czp lwip -f lwip-1.3.0.tar.gz + tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz + mv $set "${S}"/stubdom/ + einfo "tarballs moved to source" +} +src_prepare() { # if the user *really* wants to use their own custom-cflags, let them if use custom-cflags; then einfo "User wants their own CFLAGS - removing defaults" @@ -51,15 +71,6 @@ src_prepare() { -i {} \; fi - #Substitute for internal downloading - cp $DISTDIR/zlib-1.2.3.tar.gz \ - $DISTDIR/pciutils-2.2.9.tar.bz2 \ - $DISTDIR/lwip-1.3.0.tar.gz \ - $DISTDIR/newlib-1.16.0.tar.gz \ - $DISTDIR/grub-0.97.tar.gz \ - ./stubdom/ || die "files not coped to stubdom" - einfo "files copied to stubdom" - # Patch the unmergeable newlib, fix most of the leftover gcc QA issues cp "${FILESDIR}"/newlib-implicits.patch stubdom || die @@ -75,8 +86,9 @@ src_prepare() { #Sec patch epatch "${FILESDIR}"/${PN/-pvgrub/}-4-CVE-2012-6075-XSA-41.patch - # wrt Bug #455196 - epatch "${FILESDIR}"/${P/-pvgrub/}-CC.patch + #Substitute for internal downloading. pciutils copied only due to the only .bz2 + cp $DISTDIR/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom" + retar-externals || die "re-tar procedure failed" } src_compile() { @@ -91,11 +103,12 @@ src_compile() { emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub elif use amd64; then - emake CC="$(tc-getCC)" LD="$(tc-getLD)" \ + emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub if use multilib; then multilib_toolchain_setup x86 - emake CC="$(tc-getCC)" XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub + emake CC="$(tc-getCC)" AR="$(tc-getAR)" \ + XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub fi fi } |