- updated to 2.5.0

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

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index f9a9ecad341702a9536cc8b162cbe11234b66774..b118f7a9b3b01bac7edb576dcb9173b453f68cc8 100644 (file)
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- qemu-2.5.0/configure.orig  2015-12-16 22:04:48.000000000 +0000
++++ qemu-2.5.0/configure       2016-01-20 08:44:46.108727000 +0000
+@@ -418,10 +418,6 @@
  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"
@@ -11,12 +11,17 @@
  
  # make source path absolute
  source_path=`cd "$source_path"; pwd`
-@@ -3549,8 +3545,6 @@
+@@ -4498,12 +4494,8 @@
+ # 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
  
- 
+ ##########################################