Fix build failure on non-KVM targets.

Package-Manager: portage-2.2.0_alpha84_p18/cvs/Linux x86_64

6 files changed, 78 insertions, 9 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index a028a2036293..acd0fc37cb50 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.84 2012/01/22 19:30:01 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.85 2012/01/22 20:40:49 slyfox Exp $
+
+  22 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/qemu-kvm-1.0-fix-nonkvm-arches.patch,
+  +files/qemu-kvm-9999-fix-nonkvm-arches.patch, qemu-kvm-1.0.ebuild,
+  qemu-kvm-9999.ebuild:
+  Fix build failure on non-KVM targets.
 
   22 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org>
   +files/65-gentoo-kvm.rules, qemu-kvm-9999.ebuild:
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index 1c14539f0b68..a819be6dc050 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -6,6 +6,8 @@ AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b
 AUX qemu-kvm 61 RMD160 83882e881a067065258f562ad1e60440666c85d3 SHA1 a965f19031e303d583bd541c9d8fff2214262e6b SHA256 211d51f0a7d3d2ba8c53016c75e2b483feadbb65e383b1eec81d9cebf6a22c29
 AUX qemu-kvm-0.12.3-fix-crash-with-sdl.patch 4003 RMD160 1e8965e94537e24d0903a7a096c91e35f7013118 SHA1 a6a36da9613d90d45148aa133392bd342b83d1cd SHA256 aeca9f133c021726c0e3ce2a58843ee12d592669143d0b75e46b8e301b5cf102
 AUX qemu-kvm-0.12.3-include-madvise-defines.patch 274 RMD160 2b2b454fabc3b5362c0479d581e5fb038e02aa97 SHA1 c34b51b9c0b5a69ab2ab7a8a64c804f7cbbbebf5 SHA256 0d33d22a853e9b1d19786c9ac53a515587a9753ff69a2f53e61c4764590e7821
+AUX qemu-kvm-1.0-fix-nonkvm-arches.patch 742 RMD160 112937dafa2847d6d388ed33e539502d238ad098 SHA1 3f0a72d5441606b142907c41d47ec356483588e7 SHA256 3f2bf2def429453a8a9adbc2adf9d4f2e1d4c1f505ce0ade8f3810b74c281f02
+AUX qemu-kvm-9999-fix-nonkvm-arches.patch 932 RMD160 8313ef828bfe7236b8f2e4d5094cb20949164fcb SHA1 7817b5fba72d685e66bf2a68380eb391aea828e4 SHA256 fd14ba9808274e38a5776abc608a6c4263becd0b72f919f4685d30042e413e2b
 AUX qemu-kvm-guest-hang-on-usb-add.patch 3491 RMD160 7bc186c283b0eb220a47895f7cab50e191f1a3ea SHA1 00f36fd0197fa9d359e28a9ef2f56a1ee860fddf SHA256 d3068a419d69dbe44758830509fc13460d1497b14a5a10ffad910552da0c86b3
 DIST qemu-kvm-0.14.1-backports-2.tar.bz2 20045 RMD160 a6dfdfc4969ff96d287af389c99c9df9df16ff07 SHA1 4ea70f09ca8d24e30d307319352d9857031d3ccb SHA256 ab0e30b550475b379215d2fdeae9be2b8ad4e66a42bfad406683132892ea5982
 DIST qemu-kvm-0.14.1.tar.gz 5321321 RMD160 e3d69b4756bb0e45d14baad72d85827d949e0ae0 SHA1 7378f10ea04db19e5a5009cae1ecb65517e82877 SHA256 a59c4f6ab8646f2f019d2f9f15443e4db8289cf7cf47743d3c63d18fc584da27
@@ -16,14 +18,14 @@ DIST qemu-kvm-1.0.tar.gz 6210473 RMD160 6503b6ec9c8d89b785d644f5c4b47b4716e2fab7
 EBUILD qemu-kvm-0.14.1-r2.ebuild 9073 RMD160 3613eb69d77c9ff0a0540bd3bf73e2b8c5867bac SHA1 3cf8e92d3704a05467f585a70fceeac99df8ea3b SHA256 a2052650abb05e5caecf35903c57ba1660a1ab9081a68b90fbf4ad9d09cfd70f
 EBUILD qemu-kvm-0.15.0.ebuild 9348 RMD160 3fc656e89f7a8f93ce4d4f3a7228c3c31b7e7032 SHA1 9b6fd4ca069267011fbcc65ec334116a93e53c09 SHA256 e41d497198654beb53f0b0004803d03b413410b91a4d7f56eda56f4fc97fb2c9
 EBUILD qemu-kvm-0.15.1-r1.ebuild 9636 RMD160 1a2b9f0373ab33f18ce5a33be3ac5af4d8c7f1ab SHA1 89ffaea156b9961ea6187f5904f6302fbfa95e9a SHA256 e5eb53ec818df1964072ca6ebe792ecab52e1907bf3bbb0218e9dd7f24ea467b
-EBUILD qemu-kvm-1.0.ebuild 10343 RMD160 2d98ff95ae2246b0c95d8e89333bed1fe58445ab SHA1 8234a32def7cbe9ca28c8d43dd24496d76fcc37c SHA256 2906b36882801fd58838cbdb544bcad0f657d67dcca3f89c8ad590df5ae56f8d
-EBUILD qemu-kvm-9999.ebuild 10336 RMD160 7988cc86630085c291b202722639027fcbd73f85 SHA1 58a540f7745eaacb2e7fac0f7e374468cf98884a SHA256 c7d9e031b519b775197a4257bab862513182d6e66210b3ad061794ed20674831
-MISC ChangeLog 17737 RMD160 06845b8fc7024182e310502555694137658ac8ea SHA1 5e5e7add6dd24c13c4e3e92b8a38f1de1dc546ec SHA256 ef475f709da2546f33c74d5bfc77a2897d17b39a08bdd90140df76babdf1969b
+EBUILD qemu-kvm-1.0.ebuild 10400 RMD160 3517e6106e2e5c828dd93038ded588189276a4e2 SHA1 e5f0d79a5ae5cd53e614a32caf811356c66c1490 SHA256 645230d7a466959413c4db661a0c01f0ae8fd71caf02ff8e96f4e02a4aae831d
+EBUILD qemu-kvm-9999.ebuild 10457 RMD160 31587aa73cf2ecfc411afdd960179390911051a6 SHA1 651810cfdc30689c864689f67d84b15b83965100 SHA256 a13e455b023137022af3fdaf1966c8699bcf8f6decc3bb00737ed20177e067f5
+MISC ChangeLog 17972 RMD160 535bdcc35d5a9d293bc34a38cf6f7b7c4c9fec83 SHA1 a9df38259b82f97d689df8659b672585be13c292 SHA256 a83275eca62cca9264c577c910d40694ec2e70a8f894989c064f339e678d77ba
 MISC metadata.xml 1790 RMD160 4179a5fe624d3c2ab55ed90d65c473ce644a943e SHA1 bdcfb49dd78aaefdcb8b5c7b92bd7829890df132 SHA256 68ab30c94b1fe8b5e681e936369a9fe39f2b657015c3e1e7e05145026a427ac2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8cZMAACgkQcaHudmEf86pEqQCfQY9ONHglWigW/V3hz8iyvclJ
-W58AmgO9n9ugvICzJTIDxmiiI/kqs8qp
-=MoRn
+iEYEARECAAYFAk8cdV8ACgkQcaHudmEf86rYagCfUcGYHCA45Q+j8csD8p6Srpzf
+tNYAniB2Kr5dbD7MQE4tpGjE/0V2UkRl
+=E57s
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-1.0-fix-nonkvm-arches.patch b/app-emulation/qemu-kvm/files/qemu-kvm-1.0-fix-nonkvm-arches.patch
new file mode 100644
index 000000000000..d66a99135921
--- /dev/null
+++ b/app-emulation/qemu-kvm/files/qemu-kvm-1.0-fix-nonkvm-arches.patch
@@ -0,0 +1,23 @@
+Fix build failure caused by KVM-specific code in arches not supporting KVM:
+  LINK  alpha-softmmu/qemu-system-alpha
+i8259.o: In function `kvm_i8259_set_irq':
+/tmp/portage/app-emulation/qemu-kvm-9999/work/qemu-kvm-9999/hw/i8259.c:689: undefined reference to `apic_set_irq_delivered'
+diff --git a/hw/i8259.c b/hw/i8259.c
+index 0632ea2..2f6789d 100644
+--- a/hw/i8259.c
++++ b/hw/i8259.c
+@@ -682,12 +683,14 @@ static int kvm_kernel_pic_load_from_user(PicState *s)
+ 
+ static void kvm_i8259_set_irq(void *opaque, int irq, int level)
+ {
++#ifdef CONFIG_KVM
+     int pic_ret;
+     if (kvm_set_irq(irq, level, &pic_ret)) {
+         if (pic_ret != 0)
+             apic_set_irq_delivered();
+         return;
+     }
++#endif
+ }
+ 
+ device_init(pic_register)
diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch b/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch
new file mode 100644
index 000000000000..2c36e7e303a6
--- /dev/null
+++ b/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch
@@ -0,0 +1,31 @@
+Fix build failure caused by KVM-specific code in arches not supporting KVM:
+  LINK  alpha-softmmu/qemu-system-alpha
+i8259.o: In function `kvm_i8259_set_irq':
+/tmp/portage/app-emulation/qemu-kvm-9999/work/qemu-kvm-9999/hw/i8259.c:689: undefined reference to `apic_set_irq_delivered'
+diff --git a/hw/i8259.c b/hw/i8259.c
+index 0632ea2..2f6789d 100644
+--- a/hw/i8259.c
++++ b/hw/i8259.c
+@@ -21,6 +21,7 @@
+  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  * THE SOFTWARE.
+  */
++#include "apic.h"
+ #include "hw.h"
+ #include "pc.h"
+ #include "isa.h"
+@@ -682,12 +683,14 @@ static int kvm_kernel_pic_load_from_user(PicState *s)
+ 
+ static void kvm_i8259_set_irq(void *opaque, int irq, int level)
+ {
++#ifdef CONFIG_KVM
+     int pic_ret;
+     if (kvm_set_irq(irq, level, &pic_ret)) {
+         if (pic_ret != 0)
+             apic_set_irq_delivered();
+         return;
+     }
++#endif
+ }
+ 
+ device_init(pic_register)
diff --git a/app-emulation/qemu-kvm/qemu-kvm-1.0.ebuild b/app-emulation/qemu-kvm/qemu-kvm-1.0.ebuild
index e429c2b55778..7b43f4150025 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-1.0.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0.ebuild,v 1.3 2012/01/17 22:23:53 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0.ebuild,v 1.4 2012/01/22 20:40:49 slyfox Exp $
 
 #BACKPORTS=1
 
@@ -181,6 +181,8 @@ src_prepare() {
 	# to the qemu-devel ml - bug 337988
 	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
 
+	epatch "${FILESDIR}"/${PN}-1.0-fix-nonkvm-arches.patch
+
 	[[ -n ${BACKPORTS} ]] && \
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
 			epatch
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index a822fb1ec372..8c75255d6cfe 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.27 2012/01/22 19:30:01 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.28 2012/01/22 20:40:49 slyfox Exp $
 
 #BACKPORTS=1
 
@@ -120,6 +120,9 @@ QA_WX_LOAD="${QA_PRESTRIPPED}
 	usr/bin/qemu-microblazeel
 	usr/bin/qemu-mips
 	usr/bin/qemu-mipsel
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
 	usr/bin/qemu-sh4
 	usr/bin/qemu-sh4eb
 	usr/bin/qemu-sparc
@@ -184,6 +187,8 @@ src_prepare() {
 	# to the qemu-devel ml - bug 337988
 	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
 
+	epatch "${FILESDIR}"/${PN}-9999-fix-nonkvm-arches.patch
+
 	[[ -n ${BACKPORTS} ]] && \
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
 			epatch