upstream patch to fix build with glibc 2.27

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

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index b992962b813b54d6cd47c8f8ab610fdb3649b59a..bdc711253c8571e0134aab02260b99915573b84e 100644 (file)
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,22 +1,16 @@
---- qemu-1.2.0/configure.orig  2012-09-05 16:03:06.000000000 +0200
-+++ qemu-1.2.0/configure       2012-09-23 18:41:12.717279277 +0200
-@@ -281,10 +281,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"
--if test "$debug_info" = "yes"; then
--    CFLAGS="-g $CFLAGS"
--    LDFLAGS="-g $LDFLAGS"
--fi
+--- qemu-2.5.0/configure~      2015-12-21 22:27:18.000000000 +0100
++++ qemu-2.5.0/configure       2015-12-21 22:29:00.990327069 +0100
+@@ -4494,12 +4494,8 @@
+ # After here, no more $cc or $ld runs
  
- # make source path absolute
- source_path=`cd "$source_path"; pwd`
-@@ -2995,8 +2991,6 @@
  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
--  CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"
+-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
  
-
+ ##########################################