[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/30] configure: Display if libfdt is from system or
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 26/30] configure: Display if libfdt is from system or git |
Date: |
Wed, 9 May 2018 00:14:43 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
The configure script outputs "yes" regardless which libfdt is used:
./configure
[...]
fdt support yes
Sometimes you can have both system and local git version available,
change the configure script to display which library got selected:
debian8$ dpkg-query --showformat='${Version}\n' --show libfdt-dev
1.4.0+dfsg-1
debian8$ ./configure
[...]
fdt support git
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 43756dc..407bf84 100755
--- a/configure
+++ b/configure
@@ -3785,15 +3785,14 @@ int main(void) { fdt_first_subnode(0, 0); return 0; }
EOF
if compile_prog "" "$fdt_libs" ; then
# system DTC is good - use it
- fdt=yes
+ fdt=system
else
# have GIT checkout, so activate dtc submodule
if test -e "${source_path}/.git" ; then
git_submodules="${git_submodules} dtc"
fi
if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git"
; then
- fdt=yes
- dtc_internal="yes"
+ fdt=git
mkdir -p dtc
if [ "$pwd_is_source_path" != "y" ] ; then
symlink "$source_path/dtc/Makefile" "dtc/Makefile"
@@ -6334,7 +6333,7 @@ fi
if test "$preadv" = "yes" ; then
echo "CONFIG_PREADV=y" >> $config_host_mak
fi
-if test "$fdt" = "yes" ; then
+if test "$fdt" != "no" ; then
echo "CONFIG_FDT=y" >> $config_host_mak
fi
if test "$membarrier" = "yes" ; then
@@ -7136,7 +7135,7 @@ echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak
done # for target in $targets
-if [ "$dtc_internal" = "yes" ]; then
+if [ "$fdt" = "git" ]; then
echo "config-host.h: subdir-dtc" >> $config_host_mak
fi
if [ "$capstone" = "git" -o "$capstone" = "internal" ]; then
--
1.8.3.1
- [Qemu-devel] [PULL 18/30] qemu-options: Remove remainders of the -tdf option, (continued)
- [Qemu-devel] [PULL 18/30] qemu-options: Remove remainders of the -tdf option, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 19/30] qemu-options: Bail out on unsupported options instead of silently ignoring them, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 20/30] qemu-options: Remove deprecated -no-kvm-pit-reinjection, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 16/30] target/i386: sev: fix memory leaks, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 15/30] opts: don't silently truncate long option values, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 21/30] qemu-options: Remove deprecated -no-kvm-irqchip, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 25/30] configure: Really use local libfdt if the system one is too old, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 22/30] qemu-doc: provide details of supported build platforms, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 23/30] glib: bump min required glib library version to 2.42, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 27/30] shippable: Remove Debian 8 libfdt kludge, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 26/30] configure: Display if libfdt is from system or git,
Paolo Bonzini <=
- [Qemu-devel] [PULL 24/30] i386/kvm: add support for Hyper-V reenlightenment MSRs, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 28/30] build: Silence dtc directory creation, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 29/30] pc-dimm: fix error messages if no slots were defined, Paolo Bonzini, 2018/05/08
- [Qemu-devel] [PULL 30/30] rename included C files to foo.inc.c, remove osdep.h, Paolo Bonzini, 2018/05/08
- Re: [Qemu-devel] [PULL 00/30] Misc patches for 2018-05-09, Peter Maydell, 2018/05/11