New commits:
commit 841eaf9752db304c80e2a637cbda9898ba3b5fdd
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>
qemu: added versions 0.11.1 and 0.12.2
added queries for supported audio systems and emulated audio cards
added option for KVM support
added ncurses, gnutls, curl, LIBSASL, bridge-utils and iproute2 as
optional dependencies
-#
-# Disable PIC if building soft MMU targets
-# Pentium3/4 or athlon(-xp) breaks on building soft MMU
-# generally shrinking march down to pentium-mmx
-#
-if grep -q softmmu <<< "$QEMU_ARCHS"; then
- # we need to check does 0.10 act the same way
- message "${MESSAGE_COLOR}QEMU 0.9 has a build problem with advanced
CFLAGS.${DEFAULT_COLOR}" &&
- message "${MESSAGE_COLOR}Trying to make it work, starting with removal of
any sse flags.${DEFAULT_COLOR}" &&
- # sse seems to be bad; -march=pentium -m3dnow worked, though
- list_remove CFLAGS -msse -msse2 -msse3 -mfpmath=sse &&
- if [[ "$CFLAGS" =~ -march=pentium[^[:space:]]+ ]]; then
- message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
pentium-mmx.${DEFAULT_COLOR}" &&
- list_remove CFLAGS $BASH_REMATCH &&
- CFLAGS="$CFLAGS -march=pentium-mmx"
- fi &&
+if [[ $QEMU_VER == "0.10.6" ]] || [[ $QEMU_VER == "0.11.1" ]]; then
+ if [[ ! $OPTS =~ "--disable-kqemu" ]]; then
+ #
+ # Disable PIC if building soft MMU targets
+ # Pentium3/4 or athlon(-xp) breaks on building soft MMU
+ # generally shrinking march down to pentium-mmx
+ #
+ if grep -q softmmu <<< "$QEMU_ARCHS"; then
+ # we need to check does 0.10 act the same way
+ message "${MESSAGE_COLOR}QEMU $QEMU_VER has a build problem with
advanced CFLAGS.${DEFAULT_COLOR}" &&
+ message "${MESSAGE_COLOR}Trying to make it work, starting with removal
of any sse flags.${DEFAULT_COLOR}" &&
+ # sse seems to be bad; -march=pentium -m3dnow worked, though
+ list_remove CFLAGS -msse -msse2 -msse3 -mfpmath=sse &&
+ if [[ "$CFLAGS" =~ -march=pentium[^[:space:]]+ ]]; then
+ message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
pentium-mmx.${DEFAULT_COLOR}" &&
+ list_remove CFLAGS $BASH_REMATCH &&
+ CFLAGS="$CFLAGS -march=pentium-mmx"
+ fi &&
- # -march=prescott was added after
- if [[ "$CFLAGS" =~ -march=prescott ]]; then
- message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
pentium-mmx.${DEFAULT_COLOR}" &&
- list_remove CFLAGS $BASH_REMATCH &&
- CFLAGS="$CFLAGS -march=pentium-mmx"
- fi &&
- if [[ "$CFLAGS" =~ -march=athlon[^[:space:]]* ]]; then
- message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
k6-3.${DEFAULT_COLOR}" &&
- list_remove CFLAGS $BASH_REMATCH &&
- CFLAGS="$CFLAGS -march=k6-3"
- fi &&
- disable_pic
-fi &&
+ # -march=prescott was added after
+ if [[ "$CFLAGS" =~ -march=prescott ]]; then
+ message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
pentium-mmx.${DEFAULT_COLOR}" &&
+ list_remove CFLAGS $BASH_REMATCH &&
+ CFLAGS="$CFLAGS -march=pentium-mmx"
+ fi &&
+ if [[ "$CFLAGS" =~ -march=athlon[^[:space:]]* ]]; then
+ message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
k6-3.${DEFAULT_COLOR}" &&
+ list_remove CFLAGS $BASH_REMATCH &&
+ CFLAGS="$CFLAGS -march=k6-3"
+ fi &&
+ disable_pic
+ fi
+ fi
+fi &&
diff --git a/utils/qemu/PREPARE b/utils/qemu/PREPARE
new file mode 100755
index 0000000..150110d
--- /dev/null
+++ b/utils/qemu/PREPARE
@@ -0,0 +1,2 @@
+config_query_list QEMU_VER "Which version would you like to build?" \
+ 0.10.6 0.11.1 0.12.2
diff --git a/utils/qemu/qemu-0.11.1.tar.gz.sig
b/utils/qemu/qemu-0.11.1.tar.gz.sig
new file mode 100644
index 0000000..c5e7abd
Binary files /dev/null and b/utils/qemu/qemu-0.11.1.tar.gz.sig differ
diff --git a/utils/qemu/qemu-0.12.2.tar.gz.sig
b/utils/qemu/qemu-0.12.2.tar.gz.sig
new file mode 100644
index 0000000..b55f15d
Binary files /dev/null and b/utils/qemu/qemu-0.12.2.tar.gz.sig differ
[SM-Commit] GIT changes to master grimoire by Vasil Yonkov (841eaf9752db304c80e2a637cbda9898ba3b5fdd),
Vasil Yonkov, 01/20/2010