- updated to 2.12.1

[packages/qemu.git] / qemu-cflags.patch

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index 451868dfec1433814b4415effe0b9f510e0f986a..cf2e10656d60a29aa4c9b1208d4bf110c0743f65 100644 (file)
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,10 +1,10 @@
-diff -urp qemu-2.11.0.orig/configure qemu-2.11.0/configure
---- qemu-2.11.0.orig/configure 2018-01-25 00:10:09.335918465 +0000
-+++ qemu-2.11.0/configure      2018-01-25 00:11:23.962914017 +0000
-@@ -507,10 +507,6 @@ QEMU_CFLAGS="-Wall -Wundef -Wwrite-strin
+diff -urp qemu-2.12.0.orig/configure qemu-2.12.0/configure
+--- qemu-2.12.0.orig/configure 2018-05-01 18:42:52.740082920 +0000
++++ qemu-2.12.0/configure      2018-05-01 18:44:59.949081487 +0000
+@@ -535,10 +535,6 @@ QEMU_CFLAGS="-Wall -Wundef -Wwrite-strin
  QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
  QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
- QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/accel/tcg -I\$(SRC_PATH)/include"
+ QEMU_INCLUDES="-iquote . -iquote \$(SRC_PATH) -iquote \$(SRC_PATH)/accel/tcg -iquote \$(SRC_PATH)/include"
 -if test "$debug_info" = "yes"; then
 -    CFLAGS="-g $CFLAGS"
 -    LDFLAGS="-g $LDFLAGS"
@@ -12,8 +12,8 @@ diff -urp qemu-2.11.0.orig/configure qemu-2.11.0/configure
  
  # make source path absolute
  source_path=$(cd "$source_path"; pwd)
-@@ -5122,12 +5118,8 @@ fi
- # After here, no more $cc or $ld runs
+@@ -5420,12 +5416,8 @@ fi
+ write_c_skeleton
  
  if test "$gcov" = "yes" ; then
 -  CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
@@ -25,4 +25,4 @@ diff -urp qemu-2.11.0.orig/configure qemu-2.11.0/configure
 -  CFLAGS="-O2 $CFLAGS"
  fi
  
- ##########################################
+ if test "$have_asan" = "yes"; then