yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
05bba0
From 72b1305cb8cbcd0847a435326c7fa90273ac9c56 Mon Sep 17 00:00:00 2001
05bba0
From: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
Date: Tue, 2 Jun 2015 13:21:50 +0200
05bba0
Subject: [PATCH 3/8] configure: Require libfdt for arm, ppc, microblaze
05bba0
 softmmu targets
05bba0
05bba0
Message-id: <e24e27b010c3f7c0e6a087004f341ec9ffd73a2c.1433250807.git.mrezanin@redhat.com>
05bba0
Patchwork-id: 65305
05bba0
O-Subject: [RHEL-7.2 qemu-kvm PATCH 1/4] configure: Require libfdt for arm, ppc, microblaze softmmu targets
05bba0
Bugzilla: 1217850
05bba0
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
05bba0
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
05bba0
RH-Acked-by: Wei Huang <wei@redhat.com>
05bba0
RH-Acked-by: Jeff Nelson <jenelson@redhat.com>
05bba0
05bba0
From: Peter Maydell <peter.maydell@linaro.org>
05bba0
05bba0
A number of our softmmu targets (PPC, ARM, Microblaze) now more or
05bba0
less require flattened device tree support for various board models
05bba0
to work correctly.  Make libfdt mandatory if the target list includes
05bba0
these, rather than building unhelpful half-functional binaries.
05bba0
05bba0
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
05bba0
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
05bba0
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
05bba0
Tested-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
05bba0
Message-id: 1369409217-7553-2-git-send-email-peter.maydell@linaro.org
05bba0
(cherry-picked from e169e1e1ae1e75c522f932554890fb0f2f3e9999)
05bba0
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
05bba0
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
---
05bba0
 configure | 20 ++++++++++++++++++++
05bba0
 1 file changed, 20 insertions(+)
05bba0
05bba0
diff --git a/configure b/configure
05bba0
index 1583359..4f63345 100755
05bba0
--- a/configure
05bba0
+++ b/configure
05bba0
@@ -2645,6 +2645,26 @@ fi
05bba0
 
05bba0
 ##########################################
05bba0
 # fdt probe
05bba0
+# fdt support is mandatory for at least some target architectures,
05bba0
+# so insist on it if we're building those system emulators.
05bba0
+fdt_required=no
05bba0
+for target in $target_list; do
05bba0
+  case $target in
05bba0
+    arm*-softmmu|ppc*-softmmu|microblaze*-softmmu)
05bba0
+      fdt_required=yes
05bba0
+    ;;
05bba0
+  esac
05bba0
+done
05bba0
+
05bba0
+if test "$fdt_required" = "yes"; then
05bba0
+  if test "$fdt" = "no"; then
05bba0
+    error_exit "fdt disabled but some requested targets require it." \
05bba0
+      "You can turn off fdt only if you also disable all the system emulation" \
05bba0
+      "targets which need it (by specifying a cut down --target-list)."
05bba0
+  fi
05bba0
+  fdt=yes
05bba0
+fi
05bba0
+
05bba0
 if test "$fdt" != "no" ; then
05bba0
   fdt_libs="-lfdt"
05bba0
   cat > $TMPC << EOF
05bba0
-- 
05bba0
1.8.3.1
05bba0