0f796dd004
Update to v4.1.0. Also includes other major packaging changes as follows: There is a new package maintenance workflow - see README.PACKAGING for details. The sibling packages qemu-linux-user and qemu-testsuite are now created with the Build Service's MultiBuild feature. This also necessitates combining the qemu-linux-user changelog content back into qemu's. Luckily the delta there is quite small. Note that the qemu spec file is now that much busier, but added section markers should help reduce the confusion. Also qemu is being enabled for RISCV host compatibility, so some changes are related to that as well. OBS-URL: https://build.opensuse.org/request/show/730437 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=487
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Tue, 28 May 2019 14:23:37 -0600
|
|
Subject: configure: only populate roms if softmmu
|
|
|
|
Currently roms are mistakenly getting built in a linux-user only
|
|
configuration. Add check for softmmu in all places where our list of
|
|
roms is being added to.
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
configure | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 578d208b374261803d84c22c2479..6cfe739061d2d8fef6d89147fcd5 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6211,12 +6211,13 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
|
|
fi
|
|
done
|
|
fi
|
|
-if test "$ARCH" = "ppc64" && test "$targetos" != "Darwin" ; then
|
|
+if test "$ARCH" = "ppc64" && test "$targetos" != "Darwin" && \
|
|
+ test "$softmmu" = yes ; then
|
|
roms="$roms spapr-rtas"
|
|
fi
|
|
|
|
# Only build s390-ccw bios if we're on s390x and the compiler has -march=z900
|
|
-if test "$cpu" = "s390x" ; then
|
|
+if test "$cpu" = "s390x" && test "$softmmu" = yes ; then
|
|
write_c_skeleton
|
|
if compile_prog "-march=z900" ""; then
|
|
roms="$roms s390-ccw"
|