- updated to 5.0.0, updated BRs

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

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index f9a9ecad341702a9536cc8b162cbe11234b66774..970fe4608865dc3b897883ebd6951299463fda74 100644 (file)
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,22 +1,26 @@
---- 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_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
+--- qemu-5.0.0./configure.orig 2020-05-09 00:48:28.237641000 +0200
++++ qemu-5.0.0./configure      2020-05-09 00:50:39.164641000 +0200
+@@ -603,9 +603,6 @@
  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="-iquote . -iquote \$(SRC_PATH) -iquote \$(SRC_PATH)/accel/tcg -iquote \$(SRC_PATH)/include"
+ QEMU_INCLUDES="$QEMU_INCLUDES -iquote \$(SRC_PATH)/disas/libvixl"
 -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 @@
+ # running configure in the source tree?
+ # we know that's the case if configure is there.
+@@ -6258,12 +6255,8 @@
+ write_c_skeleton
+ 
  if test "$gcov" = "yes" ; then
-   CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
-   LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
--elif test "$debug" = "no" ; then
+-  QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
++  QEMU_CFLAGS="-fprofile-arcs -ftest-coverage $QEMU_CFLAGS"
+   QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
+-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
  
- 
+ if test "$have_asan" = "yes"; then