summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2011-11-07 17:40:42 +0000
committerAlexey Shvetsov <alexxy@gentoo.org>2011-11-07 17:40:42 +0000
commitdd99175ad7061522f2e3d4c4cadf284462dabe26 (patch)
treea772cfb94af44ce61ffada19a78eb964fa1ce8e7
parentppc/ppc64 stable wrt #384593 (diff)
downloadgentoo-2-dd99175ad7061522f2e3d4c4cadf284462dabe26.tar.gz
gentoo-2-dd99175ad7061522f2e3d4c4cadf284462dabe26.tar.bz2
gentoo-2-dd99175ad7061522f2e3d4c4cadf284462dabe26.zip
Minor sytax changes; rm -j1 from install, added die statements, prepared by Ian Delaney aka idella4
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
-rw-r--r--app-emulation/xen-pvgrub/ChangeLog6
-rw-r--r--app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild19
2 files changed, 15 insertions, 10 deletions
diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog
index c8eecf71e334..a06acb87390e 100644
--- a/app-emulation/xen-pvgrub/ChangeLog
+++ b/app-emulation/xen-pvgrub/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/xen-pvgrub
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.9 2011/11/01 10:19:29 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.10 2011/11/07 17:40:42 alexxy Exp $
+
+ 07 Nov 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-pvgrub-4.1.2.ebuild:
+ Minor sytax changes; rm -j1 from install, added die statements, prepared by
+ Ian Delaney aka idella4
01 Nov 2011; Tony Vroon <chainsaw@gentoo.org> xen-pvgrub-4.1.1-r1.ebuild:
Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
index 462f8be8b731..668ac0e44d04 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.1.2.ebuild,v 1.1 2011/10/25 18:47:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild,v 1.2 2011/11/07 17:40:42 alexxy Exp $
EAPI="2"
@@ -80,7 +80,6 @@ src_prepare() {
-e 's:^\t$(WGET) $(OCAML_URL):#\t$(WGET) $(OCAML_URL):' \
-e 's:^\t$(WGET) $(GRUB_URL):#$(WGET) $(GRUB_URL):' \
-i stubdom/Makefile || die "stubdom/Makefile could not be adjusted"
- einfo "1st Makefile adjusted"
}
src_compile() {
@@ -89,32 +88,34 @@ src_compile() {
append-flags -fno-strict-overflow
fi
- emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools/include || die "prepare libelf headers failed"
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" -C tools/include || die "prepare libelf headers failed"
if use x86; then
- emake -j1 CC=$(tc-getCC) LD=$(tc-getLD) \
+ emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub || \
die "compile pv-grub_x86_32 failed"
fi
if use amd64; then
- emake -j1 CC=$(tc-getCC) LD=$(tc-getLD) \
+ emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub || \
die "compile pv-grub_x86_64 failed"
if use multilib; then
multilib_toolchain_setup x86
- emake -j1 XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub || die "compile pv-grub_x86_32 failed"
+ emake -j1 \
+ XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub || \
+ die "compile pv-grub_x86_32 failed"
fi
fi
}
src_install() {
if use x86; then
- emake -j1 XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_32 failed"
+ emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_32 failed"
fi
if use amd64; then
- emake -j1 XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_64 failed"
+ emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_64 failed"
if use multilib; then
- emake -j1 XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_32 failed"
+ emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_32 failed"
fi
fi
}