[gentoo-commits] gentoo-x86 commit in app-emulation/xen-tools: xen-tools-4.2.4-r4.ebuild ChangeLog xen-tools-4.3.2-r3.ebuild xen-tools-4.4.0-r5.ebuild

[Yixun Lan (dlan)]

dlan        14/05/30 10:34:46

  Modified:             xen-tools-4.2.4-r4.ebuild ChangeLog
                        xen-tools-4.3.2-r3.ebuild xen-tools-4.4.0-r5.ebuild
  Log:
  fix hvm buf for no-multilib profile, bug #351648, thanks Zoltán Halassy, Spooky Ghost
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)

Revision  Changes    Path
1.2                  app-emulation/xen-tools/xen-tools-4.2.4-r4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r4.ebuild?r1=1.1&r2=1.2

Index: xen-tools-4.2.4-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-tools-4.2.4-r4.ebuild	23 May 2014 11:00:30 -0000	1.1
+++ xen-tools-4.2.4-r4.ebuild	30 May 2014 10:34:46 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r4.ebuild,v 1.1 2014/05/23 11:00:30 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r4.ebuild,v 1.2 2014/05/30 10:34:46 dlan Exp $
 
 EAPI=5
 
@@ -110,13 +110,6 @@
 		export "CONFIG_IOEMU=n"
 	fi
 
-	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
-		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
-		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
-		eerror "to build xen-tools on your current profile."
-		die "USE=hvm is unsupported on this system."
-	fi
-
 	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
 		if use x86 && use amd64; then
 			die "Confusion! Both x86 and amd64 are set in your use flags!"
@@ -182,6 +175,11 @@
 	if ! use hvm; then
 		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
 		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
 	fi
 
 	# Don't bother with qemu, only needed for fully virtualised guests
@@ -396,7 +394,7 @@
 		echo
 		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
 		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 multilib system is required to build HVM support."
+		elog "An x86 or amd64 system is required to build HVM support."
 	fi
 
 	if use xend; then



1.245                app-emulation/xen-tools/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/ChangeLog?rev=1.245&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/ChangeLog?rev=1.245&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/ChangeLog?r1=1.244&r2=1.245

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- ChangeLog	23 May 2014 11:00:30 -0000	1.244
+++ ChangeLog	30 May 2014 10:34:46 -0000	1.245
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.244 2014/05/23 11:00:30 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.245 2014/05/30 10:34:46 dlan Exp $
+
+  30 May 2014; Yixun Lan <dlan@g.o> xen-tools-4.2.4-r4.ebuild,
+  xen-tools-4.3.2-r3.ebuild, xen-tools-4.4.0-r5.ebuild:
+  fix hvm buf for no-multilib profile, bug #351648, thanks Zoltán Halassy,
+  Spooky Ghost
 
 *xen-tools-4.4.0-r5 (23 May 2014)
 *xen-tools-4.3.2-r3 (23 May 2014)



1.2                  app-emulation/xen-tools/xen-tools-4.3.2-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2-r3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2-r3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2-r3.ebuild?r1=1.1&r2=1.2

Index: xen-tools-4.3.2-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-tools-4.3.2-r3.ebuild	23 May 2014 11:00:30 -0000	1.1
+++ xen-tools-4.3.2-r3.ebuild	30 May 2014 10:34:46 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2-r3.ebuild,v 1.1 2014/05/23 11:00:30 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2-r3.ebuild,v 1.2 2014/05/30 10:34:46 dlan Exp $
 
 EAPI=5
 
@@ -115,13 +115,6 @@
 		export "CONFIG_IOEMU=n"
 	fi
 
-	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
-		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
-		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
-		eerror "to build xen-tools on your current profile."
-		die "USE=hvm is unsupported on this system."
-	fi
-
 	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
 		if use x86 && use amd64; then
 			die "Confusion! Both x86 and amd64 are set in your use flags!"
@@ -231,6 +224,11 @@
 	if ! use hvm; then
 		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
 		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
 	fi
 
 	# Don't bother with qemu, only needed for fully virtualised guests
@@ -424,7 +422,7 @@
 		echo
 		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
 		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 multilib system is required to build HVM support."
+		elog "An x86 or amd64 system is required to build HVM support."
 	fi
 
 	if use xend; then



1.2                  app-emulation/xen-tools/xen-tools-4.4.0-r5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0-r5.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0-r5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0-r5.ebuild?r1=1.1&r2=1.2

Index: xen-tools-4.4.0-r5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0-r5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-tools-4.4.0-r5.ebuild	23 May 2014 11:00:30 -0000	1.1
+++ xen-tools-4.4.0-r5.ebuild	30 May 2014 10:34:46 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0-r5.ebuild,v 1.1 2014/05/23 11:00:30 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0-r5.ebuild,v 1.2 2014/05/30 10:34:46 dlan Exp $
 
 EAPI=5
 
@@ -122,13 +122,6 @@
 		export "CONFIG_GCRYPT=y"
 	fi
 
-	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
-		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
-		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
-		eerror "to build xen-tools on your current profile."
-		die "USE=hvm is unsupported on this system."
-	fi
-
 	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
 		if use x86 && use amd64; then
 			die "Confusion! Both x86 and amd64 are set in your use flags!"
@@ -234,9 +227,13 @@
 		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
 	fi
 
-	# Disable hvm support on systems that don't support x86_32 binaries.
 	if ! use hvm; then
 		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
 	fi
 
 	# Don't bother with qemu, only needed for fully virtualised guests
@@ -421,7 +418,7 @@
 		echo
 		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
 		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 multilib system is required to build HVM support."
+		elog "An x86 or amd64 system is required to build HVM support."
 	fi
 
 	if use qemu; then