[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/7] pixman: add output dir to include path
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 1/7] pixman: add output dir to include path |
Date: |
Wed, 14 Nov 2012 14:02:35 +0100 |
Needed to make sure the (generated) pixman-version.h file is found.
Based on a patch from Blue Swirl.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
configure | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 7290f50..e6fe4f8 100755
--- a/configure
+++ b/configure
@@ -2121,11 +2121,10 @@ else
echo " git submodule update --init pixman"
exit 1
fi
- pixman_cflags="-I${source_path}/pixman/pixman"
- pixman_libs="-Lpixman/pixman/.libs -lpixman-1"
+ mkdir -p pixman/pixman
+ pixman_cflags="-I\$(SRC_PATH)/pixman/pixman -I\$(BUILD_DIR)/pixman/pixman"
+ pixman_libs="-L\$(BUILD_DIR)/pixman/pixman/.libs -lpixman-1"
fi
-QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags"
-libs_softmmu="$libs_softmmu $pixman_libs"
##########################################
# libcap probe
@@ -3137,6 +3136,10 @@ if test "$cpu" = "ppc64" -a "$targetos" != "Darwin" ;
then
roms="$roms spapr-rtas"
fi
+# add pixman flags after all config tests are done
+QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags"
+libs_softmmu="$libs_softmmu $pixman_libs"
+
echo "Install prefix $prefix"
echo "BIOS directory `eval echo $qemu_datadir`"
echo "binary directory `eval echo $bindir`"
@@ -4154,7 +4157,6 @@ DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
DIRS="$DIRS roms/seabios roms/vgabios"
DIRS="$DIRS qapi-generated"
DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace"
-DIRS="$DIRS pixman"
FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile"
--
1.7.1
- [Qemu-devel] [PULL v2 0/7] pixman build fixes, Gerd Hoffmann, 2012/11/14
- [Qemu-devel] [PATCH 1/7] pixman: add output dir to include path,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 3/7] pixman: disable gtk, Gerd Hoffmann, 2012/11/14
- [Qemu-devel] [PATCH 2/7] pixman: set --host for cross builds, Gerd Hoffmann, 2012/11/14
- [Qemu-devel] [PATCH 4/7] pixman: pass cflags, add -fPIC, Gerd Hoffmann, 2012/11/14
- [Qemu-devel] [PATCH 7/7] pixman: cleanup properly on make distclean, Gerd Hoffmann, 2012/11/14
- [Qemu-devel] [PATCH 6/7] pixman: add licensing info, Gerd Hoffmann, 2012/11/14
- [Qemu-devel] [PATCH 5/7] pixman: build internal version early, Gerd Hoffmann, 2012/11/14