[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 002/132] configure: do not include $(...) variables in config-hos
From: |
Paolo Bonzini |
Subject: |
[PATCH 002/132] configure: do not include $(...) variables in config-host.mak |
Date: |
Thu, 12 Dec 2019 13:50:46 +0100 |
This ensures that Meson will be able to reuse the results of
the tests that are performed in the configure script.
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/configure b/configure
index f50314f..9745b87 100755
--- a/configure
+++ b/configure
@@ -589,8 +589,8 @@ QEMU_CFLAGS="-fno-strict-aliasing -fno-common -fwrapv
-std=gnu99 $QEMU_CFLAGS"
QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
$QEMU_CFLAGS"
-QEMU_INCLUDES="-iquote . -iquote \$(SRC_PATH) -iquote \$(SRC_PATH)/accel/tcg
-iquote \$(SRC_PATH)/include"
-QEMU_INCLUDES="$QEMU_INCLUDES -iquote \$(SRC_PATH)/disas/libvixl"
+QEMU_INCLUDES="-iquote . -iquote ${source_path} -iquote
${source_path}/accel/tcg -iquote ${source_path}/include"
+QEMU_INCLUDES="$QEMU_INCLUDES -iquote ${source_path}/disas/libvixl"
if test "$debug_info" = "yes"; then
CFLAGS="-g $CFLAGS"
LDFLAGS="-g $LDFLAGS"
@@ -881,7 +881,7 @@ Linux)
linux="yes"
linux_user="yes"
kvm="yes"
- QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$PWD/linux-headers
$QEMU_INCLUDES"
+ QEMU_INCLUDES="-I${source_path}/linux-headers -I$PWD/linux-headers
$QEMU_INCLUDES"
supported_os="yes"
libudev="yes"
;;
@@ -4038,8 +4038,8 @@ EOF
symlink "$source_path/dtc/Makefile" "dtc/Makefile"
symlink "$source_path/dtc/scripts" "dtc/scripts"
fi
- fdt_cflags="-I\$(SRC_PATH)/dtc/libfdt"
- fdt_ldflags="-L\$(BUILD_DIR)/dtc/libfdt"
+ fdt_cflags="-I${source_path}/dtc/libfdt"
+ fdt_ldflags="-L$PWD/dtc/libfdt"
fdt_libs="$fdt_libs"
elif test "$fdt" = "yes" ; then
# Not a git build & no libfdt found, prompt for system install
@@ -4988,13 +4988,13 @@ case "$capstone" in
git_submodules="${git_submodules} capstone"
fi
mkdir -p capstone
- QEMU_CFLAGS="$QEMU_CFLAGS -I\$(SRC_PATH)/capstone/include"
+ QEMU_CFLAGS="$QEMU_CFLAGS -I${source_path}/capstone/include"
if test "$mingw32" = "yes"; then
LIBCAPSTONE=capstone.lib
else
LIBCAPSTONE=libcapstone.a
fi
- libs_cpu="-L\$(BUILD_DIR)/capstone -lcapstone $libs_cpu"
+ libs_cpu="-L$PWD/capstone -lcapstone $libs_cpu"
;;
system)
@@ -5888,8 +5888,8 @@ case "$slirp" in
git_submodules="${git_submodules} slirp"
fi
mkdir -p slirp
- slirp_cflags="-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src"
- slirp_libs="-L\$(BUILD_DIR)/slirp -lslirp"
+ slirp_cflags="-I${source_path}/slirp/src -I$PWD/slirp/src"
+ slirp_libs="-L$PWD/slirp -lslirp"
if test "$mingw32" = "yes" ; then
slirp_libs="$slirp_libs -lws2_32 -liphlpapi"
fi
@@ -7235,21 +7235,21 @@ if test "$sheepdog" = "yes" ; then
fi
if test "$tcg_interpreter" = "yes"; then
- QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/tci $QEMU_INCLUDES"
+ QEMU_INCLUDES="-iquote ${source_path}/tcg/tci $QEMU_INCLUDES"
elif test "$ARCH" = "sparc64" ; then
- QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/sparc $QEMU_INCLUDES"
+ QEMU_INCLUDES="-iquote ${source_path}/tcg/sparc $QEMU_INCLUDES"
elif test "$ARCH" = "s390x" ; then
- QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/s390 $QEMU_INCLUDES"
+ QEMU_INCLUDES="-iquote ${source_path}/tcg/s390 $QEMU_INCLUDES"
elif test "$ARCH" = "x86_64" || test "$ARCH" = "x32" ; then
- QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/i386 $QEMU_INCLUDES"
+ QEMU_INCLUDES="-iquote ${source_path}/tcg/i386 $QEMU_INCLUDES"
elif test "$ARCH" = "ppc64" ; then
- QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/ppc $QEMU_INCLUDES"
+ QEMU_INCLUDES="-iquote ${source_path}/tcg/ppc $QEMU_INCLUDES"
elif test "$ARCH" = "riscv32" || test "$ARCH" = "riscv64" ; then
- QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/riscv $QEMU_INCLUDES"
+ QEMU_INCLUDES="-I${source_path}/tcg/riscv $QEMU_INCLUDES"
else
- QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"
+ QEMU_INCLUDES="-iquote ${source_path}/tcg/\$(ARCH) $QEMU_INCLUDES"
fi
-QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg $QEMU_INCLUDES"
+QEMU_INCLUDES="-iquote ${source_path}/tcg $QEMU_INCLUDES"
echo "TOOLS=$tools" >> $config_host_mak
echo "ROMS=$roms" >> $config_host_mak
--
1.8.3.1
- [RFC PATCH v3 000/132] Proof of concept for Meson integration, Paolo Bonzini, 2019/12/12
- [PATCH 001/132] build-sys hack: ensure target directory is there, Paolo Bonzini, 2019/12/12
- [PATCH 002/132] configure: do not include $(...) variables in config-host.mak,
Paolo Bonzini <=
- [PATCH 003/132] configure: expand path variables for meson configure, Paolo Bonzini, 2019/12/12
- [PATCH 005/132] configure: generate Meson cross file, Paolo Bonzini, 2019/12/12
- [PATCH 006/132] build-sys: add meson submodule, Paolo Bonzini, 2019/12/12
- [PATCH 007/132] meson: enable pie, Paolo Bonzini, 2019/12/12
- [PATCH 008/132] meson: use coverage option, Paolo Bonzini, 2019/12/12
- [PATCH 010/132] meson: add remaining generated tcg trace helpers, Paolo Bonzini, 2019/12/12
- [PATCH 004/132] configure: integrate Meson in the build system, Paolo Bonzini, 2019/12/12
- [PATCH 011/132] meson: add version.o, Paolo Bonzini, 2019/12/12
- [PATCH 013/132] contrib/vhost-user-blk: convert to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 012/132] contrib/libvhost-user: convert to Meson, Paolo Bonzini, 2019/12/12