* [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script
@ 2010-11-14 11:48 Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 01/14] default compilation tools to environment variables Paolo Bonzini
` (14 more replies)
0 siblings, 15 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:48 UTC (permalink / raw)
To: qemu-devel
This is part two of the configure series. It does various miscellaneous
changes to the configure script that make it possible to later handle
an autoconfy command-line.
Compared to the first submission, I simplified further the handling
of srcdir (patches 11 to 13).
Paolo Bonzini (14):
default compilation tools to environment variables
default make and install to environment variables
move feature variables to the top
fix sparse support (?)
test cc with the complete set of chosen flags
do not pass bogus $(SRC_PATH) include paths to cc during configure
provide portable HOST_LONG_BITS test
fix spelling of $pkg_config, move default together with other cross tools
do not default to non-prefixed pkg-config when cross compiling
reorganize sdl-config tests
assume existence of "ln -sf"
remove source_path_used
move --srcdir detection earlier
remove HOST_CC mention from roms/{sea,vga}bios/config.mak
configure | 419 +++++++++++++++++++++++++++-----------------------------
rules.mak | 6 +-
tests/Makefile | 3 +-
3 files changed, 204 insertions(+), 224 deletions(-)
--
1.7.2.3
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 01/14] default compilation tools to environment variables
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
@ 2010-11-14 11:48 ` Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 02/14] default make and install " Paolo Bonzini
` (13 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:48 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index f62c1fe..756d72e 100755
--- a/configure
+++ b/configure
@@ -74,19 +74,13 @@ interp_prefix="/usr/gnemul/qemu-%M"
static="no"
sparc_cpu=""
cross_prefix=""
-cc="gcc"
audio_drv_list=""
audio_card_list="ac97 es1370 sb16"
audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus"
block_drv_whitelist=""
host_cc="gcc"
-ar="ar"
make="make"
install="install"
-objcopy="objcopy"
-ld="ld"
-strip="strip"
-windres="windres"
helper_cflags=""
libs_softmmu=""
libs_tools=""
@@ -100,7 +94,7 @@ for opt do
case "$opt" in
--cross-prefix=*) cross_prefix="$optarg"
;;
- --cc=*) cc="$optarg"
+ --cc=*) CC="$optarg"
;;
--cpu=*) cpu="$optarg"
;;
@@ -129,12 +123,12 @@ done
# Using uname is really, really broken. Once we have the right set of checks
# we can eliminate it's usage altogether
-cc="${cross_prefix}${cc}"
-ar="${cross_prefix}${ar}"
-objcopy="${cross_prefix}${objcopy}"
-ld="${cross_prefix}${ld}"
-strip="${cross_prefix}${strip}"
-windres="${cross_prefix}${windres}"
+cc="${cross_prefix}${CC-gcc}"
+ar="${cross_prefix}${AR-ar}"
+objcopy="${cross_prefix}${OBJCOPY-objcopy}"
+ld="${cross_prefix}${LD-ld}"
+strip="${cross_prefix}${STRIP-strip}"
+windres="${cross_prefix}${WINDRES-windres}"
# default flags for all hosts
QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 02/14] default make and install to environment variables
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 01/14] default compilation tools to environment variables Paolo Bonzini
@ 2010-11-14 11:48 ` Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 03/14] move feature variables to the top Paolo Bonzini
` (12 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:48 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index 756d72e..856f694 100755
--- a/configure
+++ b/configure
@@ -79,8 +79,6 @@ audio_card_list="ac97 es1370 sb16"
audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus"
block_drv_whitelist=""
host_cc="gcc"
-make="make"
-install="install"
helper_cflags=""
libs_softmmu=""
libs_tools=""
@@ -361,7 +359,7 @@ GNU/kFreeBSD)
;;
FreeBSD)
bsd="yes"
- make="gmake"
+ make="${MAKE-gmake}"
audio_drv_list="oss"
audio_possible_drivers="oss sdl esd pa"
# needed for kinfo_getvmmap(3) in libutil.h
@@ -369,20 +367,20 @@ FreeBSD)
;;
DragonFly)
bsd="yes"
- make="gmake"
+ make="${MAKE-gmake}"
audio_drv_list="oss"
audio_possible_drivers="oss sdl esd pa"
;;
NetBSD)
bsd="yes"
- make="gmake"
+ make="${MAKE-gmake}"
audio_drv_list="oss"
audio_possible_drivers="oss sdl esd"
oss_lib="-lossaudio"
;;
OpenBSD)
bsd="yes"
- make="gmake"
+ make="${MAKE-gmake}"
audio_drv_list="oss"
audio_possible_drivers="oss sdl esd"
oss_lib="-lossaudio"
@@ -411,8 +409,8 @@ Darwin)
;;
SunOS)
solaris="yes"
- make="gmake"
- install="ginstall"
+ make="${MAKE-gmake}"
+ install="${INSTALL-ginstall}"
ld="gld"
needs_libsunmath="no"
solarisrev=`uname -r | cut -f2 -d.`
@@ -451,7 +449,7 @@ SunOS)
;;
AIX)
aix="yes"
- make="gmake"
+ make="${MAKE-gmake}"
;;
Haiku)
haiku="yes"
@@ -477,6 +475,9 @@ if [ "$bsd" = "yes" ] ; then
bsd_user="yes"
fi
+: ${make=${MAKE-make}}
+: ${install=${INSTALL-install}}
+
if test "$mingw32" = "yes" ; then
EXESUF=".exe"
QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 03/14] move feature variables to the top
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 01/14] default compilation tools to environment variables Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 02/14] default make and install " Paolo Bonzini
@ 2010-11-14 11:48 ` Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 04/14] fix sparse support (?) Paolo Bonzini
` (11 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:48 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 160 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/configure b/configure
index 856f694..3ed0bc0 100755
--- a/configure
+++ b/configure
@@ -86,6 +86,86 @@ audio_pt_int=""
audio_win_int=""
cc_i386=i386-pc-linux-gnu-gcc
+target_list=""
+
+# Default value for a variable defining feature "foo".
+# * foo="no" feature will only be used if --enable-foo arg is given
+# * foo="" feature will be searched for, and if found, will be used
+# unless --disable-foo is given
+# * foo="yes" this value will only be set by --enable-foo flag.
+# feature will searched for,
+# if not found, configure exits with error
+#
+# Always add --enable-foo and --disable-foo command line args.
+# Distributions want to ensure that several features are compiled in, and it
+# is impossible without a --enable-foo that exits if a feature is not found.
+
+bluez=""
+brlapi=""
+curl=""
+curses=""
+docs=""
+fdt=""
+kvm=""
+kvm_para=""
+nptl=""
+sdl=""
+sparse="no"
+uuid=""
+vde=""
+vnc_tls=""
+vnc_sasl=""
+vnc_jpeg=""
+vnc_png=""
+vnc_thread="no"
+xen=""
+linux_aio=""
+attr=""
+vhost_net=""
+
+gprof="no"
+debug_tcg="no"
+debug_mon="no"
+debug="no"
+strip_opt="yes"
+bigendian="no"
+mingw32="no"
+EXESUF=""
+prefix="/usr/local"
+mandir="\${prefix}/share/man"
+datadir="\${prefix}/share/qemu"
+docdir="\${prefix}/share/doc/qemu"
+bindir="\${prefix}/bin"
+sysconfdir="\${prefix}/etc"
+confsuffix="/qemu"
+slirp="yes"
+fmod_lib=""
+fmod_inc=""
+oss_lib=""
+bsd="no"
+linux="no"
+solaris="no"
+profiler="no"
+cocoa="no"
+softmmu="yes"
+linux_user="no"
+darwin_user="no"
+bsd_user="no"
+guest_base=""
+uname_release=""
+io_thread="no"
+mixemu="no"
+kerneldir=""
+aix="no"
+blobs="yes"
+pkgversion=""
+check_utests="no"
+user_pie="no"
+zero_malloc=""
+trace_backend="nop"
+trace_file="trace"
+spice=""
+
# parse CC options first
for opt do
optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'`
@@ -208,7 +288,6 @@ else
cpu=`uname -m`
fi
-target_list=""
case "$cpu" in
alpha|cris|ia64|m68k|microblaze|ppc|ppc64|sparc64)
cpu="$cpu"
@@ -246,85 +325,6 @@ case "$cpu" in
;;
esac
-# Default value for a variable defining feature "foo".
-# * foo="no" feature will only be used if --enable-foo arg is given
-# * foo="" feature will be searched for, and if found, will be used
-# unless --disable-foo is given
-# * foo="yes" this value will only be set by --enable-foo flag.
-# feature will searched for,
-# if not found, configure exits with error
-#
-# Always add --enable-foo and --disable-foo command line args.
-# Distributions want to ensure that several features are compiled in, and it
-# is impossible without a --enable-foo that exits if a feature is not found.
-
-bluez=""
-brlapi=""
-curl=""
-curses=""
-docs=""
-fdt=""
-kvm=""
-kvm_para=""
-nptl=""
-sdl=""
-sparse="no"
-uuid=""
-vde=""
-vnc_tls=""
-vnc_sasl=""
-vnc_jpeg=""
-vnc_png=""
-vnc_thread="no"
-xen=""
-linux_aio=""
-attr=""
-vhost_net=""
-
-gprof="no"
-debug_tcg="no"
-debug_mon="no"
-debug="no"
-strip_opt="yes"
-bigendian="no"
-mingw32="no"
-EXESUF=""
-prefix="/usr/local"
-mandir="\${prefix}/share/man"
-datadir="\${prefix}/share/qemu"
-docdir="\${prefix}/share/doc/qemu"
-bindir="\${prefix}/bin"
-sysconfdir="\${prefix}/etc"
-confsuffix="/qemu"
-slirp="yes"
-fmod_lib=""
-fmod_inc=""
-oss_lib=""
-bsd="no"
-linux="no"
-solaris="no"
-profiler="no"
-cocoa="no"
-softmmu="yes"
-linux_user="no"
-darwin_user="no"
-bsd_user="no"
-guest_base=""
-uname_release=""
-io_thread="no"
-mixemu="no"
-kerneldir=""
-aix="no"
-haiku="no"
-blobs="yes"
-pkgversion=""
-check_utests="no"
-user_pie="no"
-zero_malloc=""
-trace_backend="nop"
-trace_file="trace"
-spice=""
-
# OS specific
if check_define __linux__ ; then
targetos="Linux"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 04/14] fix sparse support (?)
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
` (2 preceding siblings ...)
2010-11-14 11:48 ` [Qemu-devel] [PATCH 03/14] move feature variables to the top Paolo Bonzini
@ 2010-11-14 11:48 ` Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 05/14] test cc with the complete set of chosen flags Paolo Bonzini
` (10 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:48 UTC (permalink / raw)
To: qemu-devel
I didn't test with sparse, but the old code using += before a variable
was set was wrong. Sparse support should probably be ripped out or
redone, but this at least keeps some sanity.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 3ed0bc0..47a7525 100755
--- a/configure
+++ b/configure
@@ -2640,17 +2640,17 @@ echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
echo "CC_I386=$cc_i386" >> $config_host_mak
echo "HOST_CC=$host_cc" >> $config_host_mak
-if test "$sparse" = "yes" ; then
- echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_host_mak
- echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak
- echo "QEMU_CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
-fi
echo "AR=$ar" >> $config_host_mak
echo "OBJCOPY=$objcopy" >> $config_host_mak
echo "LD=$ld" >> $config_host_mak
echo "WINDRES=$windres" >> $config_host_mak
echo "CFLAGS=$CFLAGS" >> $config_host_mak
echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
+if test "$sparse" = "yes" ; then
+ echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_host_mak
+ echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak
+ echo "QEMU_CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
+fi
echo "HELPER_CFLAGS=$helper_cflags" >> $config_host_mak
echo "LDFLAGS=$LDFLAGS" >> $config_host_mak
echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 05/14] test cc with the complete set of chosen flags
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
` (3 preceding siblings ...)
2010-11-14 11:48 ` [Qemu-devel] [PATCH 04/14] fix sparse support (?) Paolo Bonzini
@ 2010-11-14 11:48 ` Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 06/14] do not pass bogus $(SRC_PATH) include paths to cc during configure Paolo Bonzini
` (9 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:48 UTC (permalink / raw)
To: qemu-devel
The "test the C compiler works ok" comes before a bunch of flags
are added for --cpu or just depending on the host. It helps
debugging if the test is done after these flags are (unconditionally)
added.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/configure b/configure
index 47a7525..b11bb44 100755
--- a/configure
+++ b/configure
@@ -218,31 +218,6 @@ QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS"
LDFLAGS="-g $LDFLAGS"
-gcc_flags="-Wold-style-declaration -Wold-style-definition -Wtype-limits"
-gcc_flags="-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers $gcc_flags"
-gcc_flags="-Wmissing-include-dirs -Wempty-body -Wnested-externs $gcc_flags"
-gcc_flags="-fstack-protector-all $gcc_flags"
-cat > $TMPC << EOF
-int main(void) { return 0; }
-EOF
-for flag in $gcc_flags; do
- if compile_prog "-Werror $QEMU_CFLAGS" "-Werror $flag" ; then
- QEMU_CFLAGS="$QEMU_CFLAGS $flag"
- fi
-done
-
-# check that the C compiler works.
-cat > $TMPC <<EOF
-int main(void) {}
-EOF
-
-if compile_object ; then
- : C compiler works ok
-else
- echo "ERROR: \"$cc\" either does not exist or does not work"
- exit 1
-fi
-
check_define() {
cat > $TMPC <<EOF
#if !defined($1)
@@ -934,6 +909,31 @@ echo "NOTE: The object files are built at the place where configure is launched"
exit 1
fi
+# check that the C compiler works.
+cat > $TMPC <<EOF
+int main(void) {}
+EOF
+
+if compile_object ; then
+ : C compiler works ok
+else
+ echo "ERROR: \"$cc\" either does not exist or does not work"
+ exit 1
+fi
+
+gcc_flags="-Wold-style-declaration -Wold-style-definition -Wtype-limits"
+gcc_flags="-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers $gcc_flags"
+gcc_flags="-Wmissing-include-dirs -Wempty-body -Wnested-externs $gcc_flags"
+gcc_flags="-fstack-protector-all $gcc_flags"
+cat > $TMPC << EOF
+int main(void) { return 0; }
+EOF
+for flag in $gcc_flags; do
+ if compile_prog "-Werror $QEMU_CFLAGS" "-Werror $flag" ; then
+ QEMU_CFLAGS="$QEMU_CFLAGS $flag"
+ fi
+done
+
#
# Solaris specific configure tool chain decisions
#
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 06/14] do not pass bogus $(SRC_PATH) include paths to cc during configure
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
` (4 preceding siblings ...)
2010-11-14 11:48 ` [Qemu-devel] [PATCH 05/14] test cc with the complete set of chosen flags Paolo Bonzini
@ 2010-11-14 11:48 ` Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 07/14] provide portable HOST_LONG_BITS test Paolo Bonzini
` (8 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:48 UTC (permalink / raw)
To: qemu-devel
Non-existent -I paths are dropped silently by the compiler, but still
it is not polite to pass bogus options. Configure-time tests do not
need any include files from the source path, so only include -I flags
at make time (when they're properly expanded).
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 19 +++++++++++--------
rules.mak | 6 +++---
tests/Makefile | 3 ++-
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index b11bb44..812c41c 100755
--- a/configure
+++ b/configure
@@ -215,7 +215,7 @@ QEMU_CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes $
QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
-QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS"
+QEMU_INCLUDES="-I. -I\$(SRC_PATH)"
LDFLAGS="-g $LDFLAGS"
check_define() {
@@ -2425,7 +2425,7 @@ if test $profiler = "yes" ; then
fi
if test "$slirp" = "yes" ; then
echo "CONFIG_SLIRP=y" >> $config_host_mak
- QEMU_CFLAGS="-I\$(SRC_PATH)/slirp $QEMU_CFLAGS"
+ QEMU_INCLUDES="-I\$(SRC_PATH)/slirp $QEMU_INCLUDES"
fi
if test "$vde" = "yes" ; then
echo "CONFIG_VDE=y" >> $config_host_mak
@@ -2646,6 +2646,7 @@ echo "LD=$ld" >> $config_host_mak
echo "WINDRES=$windres" >> $config_host_mak
echo "CFLAGS=$CFLAGS" >> $config_host_mak
echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
+echo "QEMU_INCLUDES=$QEMU_INCLUDES" >> $config_host_mak
if test "$sparse" = "yes" ; then
echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_host_mak
echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak
@@ -2954,19 +2955,20 @@ fi
# generate QEMU_CFLAGS/LDFLAGS for targets
cflags=""
+includes=""
ldflags=""
if test "$ARCH" = "sparc64" ; then
- cflags="-I\$(SRC_PATH)/tcg/sparc $cflags"
+ includes="-I\$(SRC_PATH)/tcg/sparc $includes"
elif test "$ARCH" = "s390x" ; then
- cflags="-I\$(SRC_PATH)/tcg/s390 $cflags"
+ includes="-I\$(SRC_PATH)/tcg/s390 $includes"
elif test "$ARCH" = "x86_64" ; then
- cflags="-I\$(SRC_PATH)/tcg/i386 $cflags"
+ includes="-I\$(SRC_PATH)/tcg/i386 $includes"
else
- cflags="-I\$(SRC_PATH)/tcg/\$(ARCH) $cflags"
+ includes="-I\$(SRC_PATH)/tcg/\$(ARCH) $includes"
fi
-cflags="-I\$(SRC_PATH)/tcg $cflags"
-cflags="-I\$(SRC_PATH)/fpu $cflags"
+includes="-I\$(SRC_PATH)/tcg $includes"
+includes="-I\$(SRC_PATH)/fpu $includes"
if test "$target_user_only" = "yes" ; then
libdis_config_mak=libdis-user/config.mak
@@ -3091,6 +3093,7 @@ fi
echo "LDFLAGS+=$ldflags" >> $config_target_mak
echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak
+echo "QEMU_INCLUDES+=$includes" >> $config_target_mak
done # for target in $targets
diff --git a/rules.mak b/rules.mak
index 6dac777..738eec3 100644
--- a/rules.mak
+++ b/rules.mak
@@ -15,13 +15,13 @@ MAKEFLAGS += -rR
QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
%.o: %.c
- $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@")
+ $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@")
%.o: %.S
- $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@")
+ $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@")
%.o: %.m
- $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@")
+ $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@")
LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(1) $(LIBS)," LINK $(TARGET_DIR)$@")
diff --git a/tests/Makefile b/tests/Makefile
index e43ec70..9ded4b7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -7,7 +7,8 @@ QEMU=../i386-linux-user/qemu-i386
QEMU_X86_64=../x86_64-linux-user/qemu-x86_64
CC_X86_64=$(CC_I386) -m64
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I..
+QEMU_INCLUDES += -I..
+CFLAGS=-Wall -O2 -g -fno-strict-aliasing
#CFLAGS+=-msse2
LDFLAGS=
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 07/14] provide portable HOST_LONG_BITS test
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
` (5 preceding siblings ...)
2010-11-14 11:48 ` [Qemu-devel] [PATCH 06/14] do not pass bogus $(SRC_PATH) include paths to cc during configure Paolo Bonzini
@ 2010-11-14 11:48 ` Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 08/14] fix spelling of $pkg_config, move default together with other cross tools Paolo Bonzini
` (7 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:48 UTC (permalink / raw)
To: qemu-devel
Do not hardcode the list of 64-bit CPUs. Use sizeof(void *) to
compute it. Renaming it to HOST_LONG_BITS to HOST_POINTER_BITS
is left for later.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 812c41c..1bc9b85 100755
--- a/configure
+++ b/configure
@@ -1077,13 +1077,15 @@ esac
fi
-# host long bits test
-hostlongbits="32"
-case "$cpu" in
- x86_64|alpha|ia64|sparc64|ppc64|s390x)
- hostlongbits=64
- ;;
-esac
+# host long bits test, actually a pointer size test
+cat > $TMPC << EOF
+int sizeof_pointer_is_8[sizeof(void *) == 8 ? 1 : -1];
+EOF
+if compile_object; then
+hostlongbits=64
+else
+hostlongbits=32
+fi
##########################################
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 08/14] fix spelling of $pkg_config, move default together with other cross tools
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
` (6 preceding siblings ...)
2010-11-14 11:48 ` [Qemu-devel] [PATCH 07/14] provide portable HOST_LONG_BITS test Paolo Bonzini
@ 2010-11-14 11:48 ` Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 09/14] do not default to non-prefixed pkg-config when cross compiling Paolo Bonzini
` (6 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:48 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/configure b/configure
index 1bc9b85..5ec1069 100755
--- a/configure
+++ b/configure
@@ -207,6 +207,7 @@ objcopy="${cross_prefix}${OBJCOPY-objcopy}"
ld="${cross_prefix}${LD-ld}"
strip="${cross_prefix}${STRIP-strip}"
windres="${cross_prefix}${WINDRES-windres}"
+pkg_config="${cross_prefix}${PKG_CONFIG-pkg-config}"
# default flags for all hosts
QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
@@ -1152,12 +1153,11 @@ EOF
fi
##########################################
-# pkgconfig probe
+# pkg-config probe
-pkgconfig="${cross_prefix}pkg-config"
-if ! has $pkgconfig; then
+if ! has $pkg_config; then
# likely not cross compiling, or hope for the best
- pkgconfig=pkg-config
+ pkg_config=pkg-config
fi
##########################################
@@ -1179,15 +1179,15 @@ fi
# Look for sdl configuration program (pkg-config or sdl-config).
# Prefer variant with cross prefix if cross compiling,
# and favour pkg-config with sdl over sdl-config.
-if test -n "$cross_prefix" -a $pkgconfig != pkg-config && \
- $pkgconfig sdl --modversion >/dev/null 2>&1; then
- sdlconfig="$pkgconfig sdl"
+if test -n "$cross_prefix" -a $pkg_config != pkg-config && \
+ $pkg_config sdl --modversion >/dev/null 2>&1; then
+ sdlconfig="$pkg_config sdl"
_sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'`
elif test -n "$cross_prefix" && has ${cross_prefix}sdl-config; then
sdlconfig="${cross_prefix}sdl-config"
_sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'`
-elif $pkgconfig sdl --modversion >/dev/null 2>&1; then
- sdlconfig="$pkgconfig sdl"
+elif $pkg_config sdl --modversion >/dev/null 2>&1; then
+ sdlconfig="$pkg_config sdl"
_sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'`
elif has sdl-config; then
sdlconfig='sdl-config'
@@ -1267,8 +1267,8 @@ if test "$vnc_tls" != "no" ; then
#include <gnutls/gnutls.h>
int main(void) { gnutls_session_t s; gnutls_init(&s, GNUTLS_SERVER); return 0; }
EOF
- vnc_tls_cflags=`$pkgconfig --cflags gnutls 2> /dev/null`
- vnc_tls_libs=`$pkgconfig --libs gnutls 2> /dev/null`
+ vnc_tls_cflags=`$pkg_config --cflags gnutls 2> /dev/null`
+ vnc_tls_libs=`$pkg_config --libs gnutls 2> /dev/null`
if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then
vnc_tls=yes
libs_softmmu="$vnc_tls_libs $libs_softmmu"
@@ -1561,8 +1561,8 @@ fi
##########################################
# curl probe
-if $pkgconfig libcurl --modversion >/dev/null 2>&1; then
- curlconfig="$pkgconfig libcurl"
+if $pkg_config libcurl --modversion >/dev/null 2>&1; then
+ curlconfig="$pkg_config libcurl"
else
curlconfig=curl-config
fi
@@ -1594,7 +1594,7 @@ if test "$check_utests" != "no" ; then
#include <check.h>
int main(void) { suite_create("qemu test"); return 0; }
EOF
- check_libs=`$pkgconfig --libs check`
+ check_libs=`$pkg_config --libs check`
if compile_prog "" $check_libs ; then
check_utests=yes
libs_tools="$check_libs $libs_tools"
@@ -1613,8 +1613,8 @@ if test "$bluez" != "no" ; then
#include <bluetooth/bluetooth.h>
int main(void) { return bt_error(0); }
EOF
- bluez_cflags=`$pkgconfig --cflags bluez 2> /dev/null`
- bluez_libs=`$pkgconfig --libs bluez 2> /dev/null`
+ bluez_cflags=`$pkg_config --cflags bluez 2> /dev/null`
+ bluez_libs=`$pkg_config --libs bluez 2> /dev/null`
if compile_prog "$bluez_cflags" "$bluez_libs" ; then
bluez=yes
libs_softmmu="$bluez_libs $libs_softmmu"
@@ -1658,7 +1658,7 @@ EOF
kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include"
fi
else
- kvm_cflags=`$pkgconfig --cflags kvm-kmod 2>/dev/null`
+ kvm_cflags=`$pkg_config --cflags kvm-kmod 2>/dev/null`
fi
if compile_prog "$kvm_cflags" "" ; then
kvm=yes
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 09/14] do not default to non-prefixed pkg-config when cross compiling
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
` (7 preceding siblings ...)
2010-11-14 11:48 ` [Qemu-devel] [PATCH 08/14] fix spelling of $pkg_config, move default together with other cross tools Paolo Bonzini
@ 2010-11-14 11:48 ` Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 10/14] reorganize sdl-config tests Paolo Bonzini
` (5 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:48 UTC (permalink / raw)
To: qemu-devel
This can still be requested with PKG_CONFIG=/path/to/pkg-config.
Just do not use it as a default, and print a warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 5ec1069..4556a1d 100755
--- a/configure
+++ b/configure
@@ -1156,8 +1156,8 @@ fi
# pkg-config probe
if ! has $pkg_config; then
- # likely not cross compiling, or hope for the best
- pkg_config=pkg-config
+ echo warning: proceeding without "$pkg_config" >&2
+ pkg_config=/bin/false
fi
##########################################
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 10/14] reorganize sdl-config tests
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
` (8 preceding siblings ...)
2010-11-14 11:48 ` [Qemu-devel] [PATCH 09/14] do not default to non-prefixed pkg-config when cross compiling Paolo Bonzini
@ 2010-11-14 11:48 ` Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 11/14] assume existence of "ln -sf" Paolo Bonzini
` (4 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:48 UTC (permalink / raw)
To: qemu-devel
This also allows overriding it with SDL_CONFIG, and warning in suspicious
cross-compilation scenarios.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index 4556a1d..2d2d306 100755
--- a/configure
+++ b/configure
@@ -208,6 +208,7 @@ ld="${cross_prefix}${LD-ld}"
strip="${cross_prefix}${STRIP-strip}"
windres="${cross_prefix}${WINDRES-windres}"
pkg_config="${cross_prefix}${PKG_CONFIG-pkg-config}"
+sdl_config="${cross_prefix}${SDL_CONFIG-sdl-config}"
# default flags for all hosts
QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
@@ -1176,21 +1177,17 @@ fi
##########################################
# SDL probe
-# Look for sdl configuration program (pkg-config or sdl-config).
-# Prefer variant with cross prefix if cross compiling,
-# and favour pkg-config with sdl over sdl-config.
-if test -n "$cross_prefix" -a $pkg_config != pkg-config && \
- $pkg_config sdl --modversion >/dev/null 2>&1; then
- sdlconfig="$pkg_config sdl"
- _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'`
-elif test -n "$cross_prefix" && has ${cross_prefix}sdl-config; then
- sdlconfig="${cross_prefix}sdl-config"
- _sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'`
-elif $pkg_config sdl --modversion >/dev/null 2>&1; then
+# Look for sdl configuration program (pkg-config or sdl-config). Try
+# sdl-config even without cross prefix, and favour pkg-config over sdl-config.
+if test "`basename $sdl_config`" != sdl-config && ! has ${sdl_config}; then
+ sdl_config=sdl-config
+fi
+
+if $pkg_config sdl --modversion >/dev/null 2>&1; then
sdlconfig="$pkg_config sdl"
_sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'`
-elif has sdl-config; then
- sdlconfig='sdl-config'
+elif has ${sdl_config}; then
+ sdlconfig="$sdl_config"
_sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'`
else
if test "$sdl" = "yes" ; then
@@ -1198,6 +1195,9 @@ else
fi
sdl=no
fi
+if test -n "$cross_prefix" && test "`basename $sdlconfig`" = sdl-config; then
+ echo warning: using "\"$sdlconfig\"" to detect cross-compiled sdl >&2
+fi
sdl_too_old=no
if test "$sdl" != "no" ; then
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 11/14] assume existence of "ln -sf"
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
` (9 preceding siblings ...)
2010-11-14 11:48 ` [Qemu-devel] [PATCH 10/14] reorganize sdl-config tests Paolo Bonzini
@ 2010-11-14 11:48 ` Paolo Bonzini
2010-11-14 14:39 ` Blue Swirl
2010-11-14 11:49 ` [Qemu-devel] [PATCH 12/14] simplify source_path handling Paolo Bonzini
` (3 subsequent siblings)
14 siblings, 1 reply; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:48 UTC (permalink / raw)
To: qemu-devel
The code in this patch was introduced for a Solaris port, but
ln -sf exists in Solaris 2.6 at least.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/configure b/configure
index 2d2d306..5a3b127 100755
--- a/configure
+++ b/configure
@@ -2676,8 +2676,7 @@ fi
for d in libdis libdis-user; do
mkdir -p $d
- rm -f $d/Makefile
- ln -s $source_path/Makefile.dis $d/Makefile
+ ln -sf $source_path/Makefile.dis $d/Makefile
echo > $d/config.mak
done
if test "$static" = "no" -a "$user_pie" = "yes" ; then
@@ -2741,12 +2740,7 @@ mkdir -p $target_dir/ide
if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then
mkdir -p $target_dir/nwfpe
fi
-
-#
-# don't use ln -sf as not all "ln -sf" over write the file/link
-#
-rm -f $target_dir/Makefile
-ln -s $source_path/Makefile.target $target_dir/Makefile
+ln -sf $source_path/Makefile.target $target_dir/Makefile
echo "# Automatically generated by configure - do not modify" > $config_target_mak
@@ -3115,10 +3109,8 @@ if test "$source_path_used" = "yes" ; then
for dir in $DIRS ; do
mkdir -p $dir
done
- # remove the link and recreate it, as not all "ln -sf" overwrite the link
for f in $FILES ; do
- rm -f $f
- ln -s $source_path/$f $f
+ test -f $f || ln -sf $source_path/$f $f
done
fi
@@ -3140,15 +3132,14 @@ for hwlib in 32 64; do
d=libhw$hwlib
mkdir -p $d
mkdir -p $d/ide
- rm -f $d/Makefile
- ln -s $source_path/Makefile.hw $d/Makefile
+ ln -sf $source_path/Makefile.hw $d/Makefile
echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak
done
d=libuser
mkdir -p $d
rm -f $d/Makefile
-ln -s $source_path/Makefile.user $d/Makefile
+ln -sf $source_path/Makefile.user $d/Makefile
if test "$static" = "no" -a "$user_pie" = "yes" ; then
echo "QEMU_CFLAGS+=-fpie" > $d/config.mak
fi
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 12/14] simplify source_path handling
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
` (10 preceding siblings ...)
2010-11-14 11:48 ` [Qemu-devel] [PATCH 11/14] assume existence of "ln -sf" Paolo Bonzini
@ 2010-11-14 11:49 ` Paolo Bonzini
2010-11-14 11:49 ` [Qemu-devel] [PATCH 13/14] move --srcdir detection earlier Paolo Bonzini
` (2 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:49 UTC (permalink / raw)
To: qemu-devel
source_path_used is not necessary since we use mkdir -p and test -f.
Also, dirname returns "." if a path has no directory component,
as is the case for "sh configure".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 45 ++++++++++++++++-----------------------------
1 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/configure b/configure
index 5a3b127..e667b12 100755
--- a/configure
+++ b/configure
@@ -472,14 +472,7 @@ fi
# find source path
source_path=`dirname "$0"`
-source_path_used="no"
-workdir=`pwd`
-if [ -z "$source_path" ]; then
- source_path=$workdir
-else
- source_path=`cd "$source_path"; pwd`
-fi
-[ -f "$workdir/vl.c" ] || source_path_used="yes"
+source_path=`cd "$source_path"; pwd`
werror=""
@@ -493,7 +486,6 @@ for opt do
--interp-prefix=*) interp_prefix="$optarg"
;;
--source-path=*) source_path="$optarg"
- source_path_used="yes"
;;
--cross-prefix=*)
;;
@@ -3093,26 +3085,21 @@ echo "QEMU_INCLUDES+=$includes" >> $config_target_mak
done # for target in $targets
-# build tree in object directory if source path is different from current one
-if test "$source_path_used" = "yes" ; then
- DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
- DIRS="$DIRS roms/seabios roms/vgabios"
- DIRS="$DIRS fsdev ui"
- FILES="Makefile tests/Makefile"
- FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
- FILES="$FILES tests/test-mmap.c"
- FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
- FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
- for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do
- FILES="$FILES pc-bios/`basename $bios_file`"
- done
- for dir in $DIRS ; do
- mkdir -p $dir
- done
- for f in $FILES ; do
- test -f $f || ln -sf $source_path/$f $f
- done
-fi
+# build tree in object directory in case the source is not in the current directory
+DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
+DIRS="$DIRS roms/seabios roms/vgabios"
+DIRS="$DIRS fsdev ui"
+FILES="Makefile tests/Makefile"
+FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
+FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
+FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
+for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do
+ FILES="$FILES pc-bios/`basename $bios_file`"
+done
+mkdir -p $DIRS
+for f in $FILES ; do
+ test -f $f || ln -sf $source_path/$f $f
+done
# temporary config to build submodules
for rom in seabios vgabios ; do
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 13/14] move --srcdir detection earlier
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
` (11 preceding siblings ...)
2010-11-14 11:49 ` [Qemu-devel] [PATCH 12/14] simplify source_path handling Paolo Bonzini
@ 2010-11-14 11:49 ` Paolo Bonzini
2010-11-14 11:49 ` [Qemu-devel] [PATCH 14/14] remove HOST_CC mention from roms/{sea, vga}bios/config.mak Paolo Bonzini
2010-11-14 20:10 ` [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Blue Swirl
14 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:49 UTC (permalink / raw)
To: qemu-devel
This will help getting config.guess and config.sub from the srcdir.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index e667b12..4412234 100755
--- a/configure
+++ b/configure
@@ -69,6 +69,7 @@ path_of() {
}
# default parameters
+source_path=`dirname "$0"`
cpu=""
interp_prefix="/usr/gnemul/qemu-%M"
static="no"
@@ -174,6 +175,8 @@ for opt do
;;
--cc=*) CC="$optarg"
;;
+ --source-path=*) source_path="$optarg"
+ ;;
--cpu=*) cpu="$optarg"
;;
--extra-cflags=*) QEMU_CFLAGS="$optarg $QEMU_CFLAGS"
@@ -220,6 +223,9 @@ QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
QEMU_INCLUDES="-I. -I\$(SRC_PATH)"
LDFLAGS="-g $LDFLAGS"
+# make source path absolute
+source_path=`cd "$source_path"; pwd`
+
check_define() {
cat > $TMPC <<EOF
#if !defined($1)
@@ -470,10 +476,6 @@ if test "$mingw32" = "yes" ; then
confsuffix=""
fi
-# find source path
-source_path=`dirname "$0"`
-source_path=`cd "$source_path"; pwd`
-
werror=""
for opt do
@@ -485,7 +487,7 @@ for opt do
;;
--interp-prefix=*) interp_prefix="$optarg"
;;
- --source-path=*) source_path="$optarg"
+ --source-path=*)
;;
--cross-prefix=*)
;;
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH 14/14] remove HOST_CC mention from roms/{sea, vga}bios/config.mak
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
` (12 preceding siblings ...)
2010-11-14 11:49 ` [Qemu-devel] [PATCH 13/14] move --srcdir detection earlier Paolo Bonzini
@ 2010-11-14 11:49 ` Paolo Bonzini
2010-11-14 20:10 ` [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Blue Swirl
14 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 11:49 UTC (permalink / raw)
To: qemu-devel
Not used in the submodules.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 4412234..4cc3754 100755
--- a/configure
+++ b/configure
@@ -3113,7 +3113,6 @@ for rom in seabios vgabios ; do
echo "CPP=${cross_prefix}cpp" >> $config_mak
echo "OBJCOPY=objcopy" >> $config_mak
echo "IASL=iasl" >> $config_mak
- echo "HOST_CC=$host_cc" >> $config_mak
echo "LD=$ld" >> $config_mak
done
--
1.7.2.3
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [Qemu-devel] [PATCH 11/14] assume existence of "ln -sf"
2010-11-14 11:48 ` [Qemu-devel] [PATCH 11/14] assume existence of "ln -sf" Paolo Bonzini
@ 2010-11-14 14:39 ` Blue Swirl
2010-11-14 14:57 ` Paolo Bonzini
0 siblings, 1 reply; 18+ messages in thread
From: Blue Swirl @ 2010-11-14 14:39 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
On Sun, Nov 14, 2010 at 11:48 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The code in this patch was introduced for a Solaris port, but
> ln -sf exists in Solaris 2.6 at least.
The problem is not that 'ln -sf' would not exist, but rather that the
force of the '-f' flag is too weak to actually remove anything.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [Qemu-devel] [PATCH 11/14] assume existence of "ln -sf"
2010-11-14 14:39 ` Blue Swirl
@ 2010-11-14 14:57 ` Paolo Bonzini
0 siblings, 0 replies; 18+ messages in thread
From: Paolo Bonzini @ 2010-11-14 14:57 UTC (permalink / raw)
To: Blue Swirl; +Cc: qemu-devel
On 11/14/2010 03:39 PM, Blue Swirl wrote:
>> > The code in this patch was introduced for a Solaris port, but
>> > ln -sf exists in Solaris 2.6 at least.
>
> The problem is not that 'ln -sf' would not exist, but rather that the
> force of the '-f' flag is too weak to actually remove anything.
Oh well...
Paolo
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
` (13 preceding siblings ...)
2010-11-14 11:49 ` [Qemu-devel] [PATCH 14/14] remove HOST_CC mention from roms/{sea, vga}bios/config.mak Paolo Bonzini
@ 2010-11-14 20:10 ` Blue Swirl
14 siblings, 0 replies; 18+ messages in thread
From: Blue Swirl @ 2010-11-14 20:10 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
On Sun, Nov 14, 2010 at 11:48 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> This is part two of the configure series. It does various miscellaneous
> changes to the configure script that make it possible to later handle
> an autoconfy command-line.
>
> Compared to the first submission, I simplified further the handling
> of srcdir (patches 11 to 13).
The patches don't apply anymore. Please rebase.
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2010-11-14 20:11 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-14 11:48 [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 01/14] default compilation tools to environment variables Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 02/14] default make and install " Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 03/14] move feature variables to the top Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 04/14] fix sparse support (?) Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 05/14] test cc with the complete set of chosen flags Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 06/14] do not pass bogus $(SRC_PATH) include paths to cc during configure Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 07/14] provide portable HOST_LONG_BITS test Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 08/14] fix spelling of $pkg_config, move default together with other cross tools Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 09/14] do not default to non-prefixed pkg-config when cross compiling Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 10/14] reorganize sdl-config tests Paolo Bonzini
2010-11-14 11:48 ` [Qemu-devel] [PATCH 11/14] assume existence of "ln -sf" Paolo Bonzini
2010-11-14 14:39 ` Blue Swirl
2010-11-14 14:57 ` Paolo Bonzini
2010-11-14 11:49 ` [Qemu-devel] [PATCH 12/14] simplify source_path handling Paolo Bonzini
2010-11-14 11:49 ` [Qemu-devel] [PATCH 13/14] move --srcdir detection earlier Paolo Bonzini
2010-11-14 11:49 ` [Qemu-devel] [PATCH 14/14] remove HOST_CC mention from roms/{sea, vga}bios/config.mak Paolo Bonzini
2010-11-14 20:10 ` [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script Blue Swirl
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.