- updated to 2.11.0, partial PLD merge

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

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index f9a9ecad341702a9536cc8b162cbe11234b66774..451868dfec1433814b4415effe0b9f510e0f986a 100644 (file)
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,22 +1,28 @@
---- qemu-1.7.0/configure.orig  2013-11-27 23:15:55.000000000 +0100
-+++ qemu-1.7.0/configure       2013-12-15 08:37:16.187664605 +0100
-@@ -332,10 +332,6 @@
+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
  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)/include"
+ QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/accel/tcg -I\$(SRC_PATH)/include"
 -if test "$debug_info" = "yes"; then
 -    CFLAGS="-g $CFLAGS"
 -    LDFLAGS="-g $LDFLAGS"
 -fi
  
  # make source path absolute
- source_path=`cd "$source_path"; pwd`
-@@ -3549,8 +3545,6 @@
+ source_path=$(cd "$source_path"; pwd)
+@@ -5122,12 +5118,8 @@ fi
+ # After here, no more $cc or $ld runs
+ 
  if test "$gcov" = "yes" ; then
-   CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
+-  CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
++  CFLAGS="-fprofile-arcs -ftest-coverage $CFLAGS"
    LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
--elif test "$debug" = "no" ; then
+-elif test "$fortify_source" = "yes" ; then
 -  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
+-elif test "$debug" = "no"; then
+-  CFLAGS="-O2 $CFLAGS"
  fi
  
- 
+ ##########################################