fix hvm buf for no-multilib profile, bug #351648, thanks Zoltán Halassy, Spooky Ghost

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

5 files changed, 44 insertions, 46 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index f6d2bdbe8b9b..baa5b45baf90 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -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@gentoo.org> 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)
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 37f2737e0157..a025b7c039ef 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -52,26 +52,26 @@ DIST xen-4.3.2.tar.gz 16472188 SHA256 17611d95f955302560ff72d97c08933b4e62bc2e8f
 DIST xen-4.4.0-upstream-patches-2.tar.xz 51840 SHA256 b1828719a42a429d66c4943bde714ac98dbd368d9f337795b3a9da4e7d755e22 SHA512 dabaa350dcc07f91df7bb4712b69f8fb5c5cf624b5e6ddfde75be891c4d7b7a81e0d8824b707fdc85a4de98929609c9f276ee871a54afa15ff21d80cebf31f80 WHIRLPOOL 6326d13e69090957d8f7f6b2cb088d597103d03b54728f37a49b89b7fac71446b4aa11c535996b206c1c7373eff8ac693e0f48b7fc3e69a566362df6eb6ecab6
 DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406
 EBUILD xen-tools-4.2.4-r2.ebuild 11986 SHA256 ce01ef25bb3545e4a93ec97a371dbf657895bf21a7e947a6cf81e2586dc080ae SHA512 e7a248987b6516495c9189b27caaec174798d62c486d685ab10b05ffe5033bceec07182e265d5227c83fd00372a86111b50594558990ee018892f431714bee66 WHIRLPOOL 2b37bdcbe274a6848f12f7eaf5fc6b2aa983ac809a2c8d30900d10bf6894d43546eb0df63f9003c25953641a6f664faa69acd387d4bec34c7268f10165c7b931
-EBUILD xen-tools-4.2.4-r4.ebuild 12522 SHA256 9faa56db4c9f53a3a85dd00fdd0d0289abf158573eadd4861653f2723a45b1cf SHA512 3e92f6a209ed89fc16b9d9a3d629f2b3b0453d64f20b69d3588a8d8382dbe81ec8a57a35ed171ddf67a827ed87faaca611aaf1d810fdd62b6d86b5c06519792f WHIRLPOOL b4814cdfb6669d9cc6f32db51629b60b480e4d528eab9fdc839e34fc67e31639c87ea52d9f8d8dfc6cfd410324b95365f97b4acea0ce4f47e74575df89ed5e68
+EBUILD xen-tools-4.2.4-r4.ebuild 12411 SHA256 2240f560e473ffe7cf9088f40788fdd778e0836d8e804a6428fd23da92086d8e SHA512 d3192b572b17853f49c436393a60fa2b01729239d9d4fe2199e81fd0954348b8e975ee206537f2ca79d0cca5f5054e493420ba81833eccc887a60c65b7aa8fd6 WHIRLPOOL f7aa083fec686bc0f3b1cdc3f0ca116a4f50b27efcc350589cddd2ea3f633962b83849ddc274a1652d86537544a800a5899bc1bf11d608a1efc9dea2a9dcfb76
 EBUILD xen-tools-4.3.2-r2.ebuild 13245 SHA256 58f321dcf96d8d1b5998b9d44be9df8656aaaee2bd946f35a1b9a3c4dba6cabe SHA512 550e6a6332a1a486b88ce2b39fa52b524aefb1f095079ca1275cf776f46a2e740088b23270209127303d7bc536a311ace6bbc85c28114158e6ade1350f41768d WHIRLPOOL d74c89983b6622ab14f64e1fb37429d50d812180036932e046114c7bac367d52f61b33e8d4794299be56fed4c8e2c26741cdc2eb7e7d4960bceefeaeefcaafc7
-EBUILD xen-tools-4.3.2-r3.ebuild 13730 SHA256 c267bca6a907c34548fa07248c238773f27e9e3bb9c716504e86a15dbd7dcd4b SHA512 63013ee7568b58a1327621e1ee9bc351a3dc422ea4db787507fde128d67840c304465e8fba646069d300fde02147c6c03537f039156cd0ed3a353182615a1a73 WHIRLPOOL 10c82f618d261989f7114872d7ec9c1b9a89293f816517356c4e46043ab6f9e2677187033abbd90d47044ecce3dd480b144589078401acb1c317dfc07939ebdb
-EBUILD xen-tools-4.4.0-r5.ebuild 13566 SHA256 0c543a7cd5148c6b607b2518b6dec14634fdb762746eecb95cbf96aca5f5f36e SHA512 dadc75321bff9ea27fe942ce54e0045e0d2f942ba84bffba62ccd364040a0043733b788dcd4ed7184726bf0c19eedb726a64b7e1b5bf09c37cd00fe58a75bcfa WHIRLPOOL fdd3d5dc88764d54a9ccc6d92ecff604b6dec9acd61274a648a36ed5778ea7c4bd497997ad112adc2b5239c8cb1f9bf567222f2b72ff623831f0bc8fbdb03b8c
-MISC ChangeLog 57997 SHA256 0f643cbdcc1162522fea92bf4f875ffade8d6009e3d0eb3ba09e4cb02a62df76 SHA512 5a627fd280cd865721f4ffca0511347574ea1fa87f534ea7b76fcac2172ba1169daab585667e4ce24d30a4ba9656313ea879910471fe1215c33903f220542553 WHIRLPOOL 673ac6d37b797a6fcd3f979ce402781b5567e02e7be0e7e14d9b679ea2edc58e1573cd19267ef57ab05ba6c4c31048b1c173a12204c1eb45a854d0bc49a9423b
+EBUILD xen-tools-4.3.2-r3.ebuild 13619 SHA256 8694854e4ff6755f14b9698b1ba8db50d504818db53f06bb0ea779bbe7039d19 SHA512 4b29b05b25bfec412a7ebfac751129f985735d323d392f2b2d3132297e71988a5078458f83af9472abf709bf0479b40a3db89ac8e534b03cfae403cdca1070ff WHIRLPOOL 4a4ab37a2fc479c576ec7d111fe19cd13d0f09ffddabc9858be2ab056ff8d9e9b0b9bf6361d9f28a7831e04ece53c8863127ee07310af5362eb004287803a8c6
+EBUILD xen-tools-4.4.0-r5.ebuild 13385 SHA256 ca6f9ea5c12c0b4adfde61bd6ac12ab2107ef2b91ab29f46326c0ecb6b4a6592 SHA512 5f88c768ea2fd57a0d184bb2926f5bec6a91024c541b0c64f3c82455984785017f6411802b32d256848e31aa5e3238bafa69cba1018994d9495ef824490fab9e WHIRLPOOL 8db11d0530aedb8f5c4f3c17057f4e6b96be4fc0792d1cfaf6a136bf619ab838a8ef63a3d5f1324e9b25cc0b330869afce5babc1f666556f07381bde19f5691a
+MISC ChangeLog 58215 SHA256 e8f63dace9efbf7207398b665a45e38ba0ae766ef705bcc89ed6fbacee87b480 SHA512 2680b66d57079adda6593054967a897f3c4db6da28838bc5d4f41cd91b5c3f95e703d9b242791525ea8a207cf6e66e64c2d5b6b00f9c76bc16134c5565a45174 WHIRLPOOL 95d12a8ba977ec3366f07ecbdaf2588df13e442c3aa301b54045ae6ba6ceb2bd2a0153031af43f0ba0a9ca9ed470f21bc22dcfb70614620b5e7a7d2f40febbb5
 MISC metadata.xml 1009 SHA256 9e8e2c5b191fffbbdf2dd0772213f5b2fe13b10e0413f9d12081f87e7ba6565b SHA512 bdd573cf6cb7664d4f0512f99f7ba5c81758d59986d764423328ce1fccc2149f0f7ca9eccefe3953ecec5f4d15bf829792f9ed07a60a5c447e1a3f5ed0d26c26 WHIRLPOOL 08f65daec784396532cc0700847d5e8545a73b49e840a491a6089945bbb9a8597ecc012bf65a6835ad5dff1623377d80360692ae9c41589130f9b4bedc909e76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTfyf/AAoJEJIMDbyqvv1VCukP/0CJ30oSzLabvDB8FIRbU/km
-4a/5VKec/yRzJErgTLEc6Ml+Oc7Wrs5A9Po8ylMe0L88yLk8Hh5NdFwn2xrYbnc6
-b9XgdF+YjqhccAQ2xk73DYnlR8BYqv9L43HvAJT87uCPemY9hebbzy6BKVWotizd
-RnbMetUwu0Vqa1l6UCSxwn70+H8vErt4qGC7jCRSxWR1XdY/eJJE50E3cJ+IRiI8
-G3BGeqsv7MqzRf6YWNPWoQ0eJ1xtEyJXQpUUk7WIkXenFYaO+9kTrUg5hN7d0euB
-FnGX4GO7FTkGijZ2qMWvlMSIIh8YCk3RRJYQyQko1us05Yo2Td8EUEnrd9NDOdTg
-SySVLeTmck1KbUjfDTiV/zPfLDmh2bZeWAyLC2XDUScUOf0DEpIh2KREz9UaATIv
-GEqosxzKDwh+fS3e4wC27YlXpRcK2ClCPeuhZh/ePpv03+XFUVFa7bMO0FzWJA+p
-vEKS7u+1ArUJyQZKXOJeYywGsyWfzqUyGGFKDrOoDvgCTRxCM10He/YIN2e2q2qj
-gCWB2fVDzywQLMTVXjgRrXsPdlaZM3nfLCCGeXTsQYa7ZoDgKVynKZS47wNdwGVy
-ebVJTwKWe3nic3D6zPXwenyidmQ83YLL5XA77foRZdXPf6SPiUurawX0SSrq4V9H
-H6ixxSNcZ1ibdAXMGiqc
-=efWt
+iQIcBAEBCAAGBQJTiFx9AAoJEJIMDbyqvv1VA0oQANV4cA2unRIQiD3wVg2B1VYa
+LC3Q1Z7VfA8ZfejdqY+9+qYtETyxU25otwD7L1XVYLR5R1SarcSoClLjC0f/G6oJ
+A/le1T8yaFIb1aI3CK/OgEU/JkIxoyLM5NSRQRxkg4fx5w8UoI0MAbAbJCRdNruD
+5Qq3G9+8ZDCohE4ONnjM6vsrjkK2hKffElUSH8Ix9X1ibel7A1zElo+yjsbWo3Tn
+CTLu2+eaaecY3A+9YwTas2cD09FWjLr6ko9gvAc3eoAXnkotoNGchXUG3Td80Ccw
+nEF5i5BVQJf8mJI0kDuqxNZTCtzqeoemiWaiwUXEuBzXo2pgq370UGA1WpHuGjD5
+oljSS4t6ddDo8PQkl87hbkQl5G52R7wuX1fBqrNXT1tACVf1+bHl6BpKiCeJuhDp
+AcwBk05cxrFuk8o8zZsDoVf54L6BQwGv9angC1HPlZYrT0hfR/l5vsUpPFoiwTld
+f1qG17sdNPNdkcWBBCE1+ky9lYNzVvb6ruNfuRIc8Dhfq1E5nBhCF4TgHaK9eaj4
+7SdM/fhW+zglB4RW693FjFW9Ed6NILNCxB1m9pslCaP+0ElnkG/pDoNnu/k2ymKq
+9I+yCRASZVcpN29MAAapKXOtjP0U5ckGl6DoYVR3+GFPub4ujawEJ9Ioig9ezD5E
+4jWLKBudY3i0WB3MKoHh
+=42Pg
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/xen-tools-4.2.4-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.2.4-r4.ebuild
index eff4ebe1d91b..3a817d1b3162 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.4-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.4-r4.ebuild
@@ -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 @@ pkg_setup() {
 		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 @@ src_prepare() {
 	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 @@ pkg_postinst() {
 		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
diff --git a/app-emulation/xen-tools/xen-tools-4.3.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.3.2-r3.ebuild
index baef68593fff..bd488f3f4377 100644
--- a/app-emulation/xen-tools/xen-tools-4.3.2-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.3.2-r3.ebuild
@@ -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 @@ pkg_setup() {
 		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 @@ src_prepare() {
 	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 @@ pkg_postinst() {
 		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
diff --git a/app-emulation/xen-tools/xen-tools-4.4.0-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.4.0-r5.ebuild
index 3706196d00f4..b767384640c4 100644
--- a/app-emulation/xen-tools/xen-tools-4.4.0-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.4.0-r5.ebuild
@@ -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 @@ pkg_setup() {
 		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 @@ src_prepare() {
 		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 @@ pkg_postinst() {
 		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