@@ -118,6 +118,8 @@ endif
subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o
+$(TOOLS): | subdir-pixman
+
subdir-pixman: pixman/Makefile
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,)
The following change does the internal pixman configuration during the QEMU configuration.
The upside is that the environment variables get passed to the sub-configure. Probably still need the Makefile fixes for CC="$(CC)", etc. just in case the pixman configuration dependencies are updated.
The down side is that \$(BUILD_DIR) and \$(SRC_PATH) cannot be used. Instead I used `pwd` and ${source_path}. Maybe with some more work the pixman configuration would work using the make variables.
@@ -2121,8 +2121,19 @@ else
echo " git submodule update --init pixman"
exit 1
fi
- pixman_cflags="-I${source_path}/pixman/pixman"
- pixman_libs="-Lpixman/pixman/.libs -lpixman-1"
+
+ if [ "$source_path" != `pwd` ]; then
+ pixman_cflags="-I$source_path/pixman/pixman -I`pwd`/pixman/pixman"
+ pixman_libs="-L`pwd`/pixman/pixman/.libs -lpixman-1"
+ mkdir -p pixman
+ else
+ pixman_cflags="-I$source_path/pixman/pixman"
+ pixman_libs="-Lpixman/pixman/.libs -lpixman-1"
+ fi
+ if test ! -f ${source_path}/pixman/configure; then
+ (cd ${source_path}/pixman; autoreconf -v --install)
+ fi
+ (cd pixman; ${source_path}/pixman/configure --disable-shared --enable-static)
fi
QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags"
libs_softmmu="$libs_softmmu $pixman_libs"