|
Lines 1-6
Link Here
|
| 1 |
--- configure.orig 2019-12-12 02:59:10 UTC |
1 |
--- configure.orig 2018-12-25 04:28:30 UTC |
| 2 |
+++ configure |
2 |
+++ configure |
| 3 |
@@ -3261,10 +3261,10 @@ fi |
3 |
@@ -3387,10 +3387,10 @@ fi |
| 4 |
# curses probe |
4 |
# curses probe |
| 5 |
if test "$curses" != "no" ; then |
5 |
if test "$curses" != "no" ; then |
| 6 |
if test "$mingw32" = "yes" ; then |
6 |
if test "$mingw32" = "yes" ; then |
|
Lines 13-19
Link Here
|
| 13 |
curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw" |
13 |
curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw" |
| 14 |
fi |
14 |
fi |
| 15 |
curses_found=no |
15 |
curses_found=no |
| 16 |
@@ -3381,7 +3381,7 @@ for i in $glib_modules; do |
16 |
@@ -3501,7 +3501,7 @@ for i in $glib_modules; do |
| 17 |
glib_libs=$($pkg_config --libs $i) |
17 |
glib_libs=$($pkg_config --libs $i) |
| 18 |
QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS" |
18 |
QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS" |
| 19 |
LIBS="$glib_libs $LIBS" |
19 |
LIBS="$glib_libs $LIBS" |
|
Lines 22-28
Link Here
|
| 22 |
else |
22 |
else |
| 23 |
error_exit "glib-$glib_req_ver $i is required to compile QEMU" |
23 |
error_exit "glib-$glib_req_ver $i is required to compile QEMU" |
| 24 |
fi |
24 |
fi |
| 25 |
@@ -5517,27 +5517,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] |
25 |
@@ -5846,27 +5846,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] |
| 26 |
cat > $TMPC <<EOF |
26 |
cat > $TMPC <<EOF |
| 27 |
int main(void) { return 0; } |
27 |
int main(void) { return 0; } |
| 28 |
EOF |
28 |
EOF |
|
Lines 72-74
Link Here
|
| 72 |
fi |
72 |
fi |
| 73 |
fi |
73 |
fi |
| 74 |
fi |
74 |
fi |
| 75 |
- |
75 |
@@ -6840,6 +6843,8 @@ elif test "$ARCH" = "x86_64" -o "$ARCH" = "x32" ; then |
|
|
76 |
QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/i386 $QEMU_INCLUDES" |
| 77 |
elif test "$ARCH" = "ppc64" ; then |
| 78 |
QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/ppc $QEMU_INCLUDES" |
| 79 |
+elif test "${ARCH%v?}" = "arm" ; then |
| 80 |
+ QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/arm $QEMU_INCLUDES" |
| 81 |
else |
| 82 |
QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES" |
| 83 |
fi |