[gentoo-commits] proj/virtualization:master commit in: app-emulation/xen-tools/

["Misbakh-Soloviev Vadim A." <mva@mva.name>]

commit:     f43c1e722bd57bd965131cdef18dcb3331908b8f
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Wed Oct 24 16:35:44 2012 +0000
Commit:     Misbakh-Soloviev Vadim A. <mva <AT> mva <DOT> name>
CommitDate: Wed Oct 24 16:35:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=commit;h=f43c1e72

[app-emulation/xen-tools] no-ipxe + build fixes

Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>

---
 app-emulation/xen-tools/xen-tools-4.2.0.ebuild |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app-emulation/xen-tools/xen-tools-4.2.0.ebuild b/app-emulation/xen-tools/xen-tools-4.2.0.ebuild
index 4b62b16..93c8afa 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.0.ebuild
@@ -15,8 +15,8 @@ if [[ $PV == *9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 	XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
-	$XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+# 	$XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz"
 	S="${WORKDIR}/xen-${PV}"
 fi
 
@@ -129,7 +129,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cp "$DISTDIR/ipxe-git-v1.0.0.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
+#	cp "$DISTDIR/ipxe-git-v1.0.0.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
 	sed -e 's/-Wall//' -i Config.mk || die "Couldn't sanitize CFLAGS"
 
 	# Drop .config
@@ -183,18 +183,18 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
 
 	# Prevent the downloading of ipxe
-	sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \
-		-e 's:^\tfi:#\tfi:' -i \
-		-e 's:^\tmv _$T $T:#\tmv _$T $T:' \
-		-i tools/firmware/etherboot/Makefile || die
+#	sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \
+#		-e 's:^\tfi:#\tfi:' -i \
+#		-e 's:^\tmv _$T $T:#\tmv _$T $T:' \
+#		-i tools/firmware/etherboot/Makefile || die
 
 	# Fix bridge by idella4, bug #362575
 	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
 
 	# Don't build ipxe with pie on hardened, Bug #360805
-	if gcc-specs-pie; then
+#	if gcc-specs-pie; then
 		epatch "${FILESDIR}/ipxe-nopie-4.2.0.patch"
-	fi
+#	fi
 }
 
 src_compile() {
@@ -208,6 +208,7 @@ src_compile() {
 	fi
 
 	unset LDFLAGS
+	unset CFLAGS
 	emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt}
 
 	if use doc; then