From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 13 Dec 2014 18:37:54 +0000 (+0100)
Subject: - resurrect no_Werror patch, new gcc, new warnings
X-Git-Tag: auto/th/xen-4.4.1-4
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=22b846abce9b57c050cc9ddf8ca6900af92dbd1b;p=packages%2Fxen.git

- resurrect no_Werror patch, new gcc, new warnings
---

diff --git a/xen-no_Werror.patch b/xen-no_Werror.patch
index c4fe9da..9f93106 100644
--- a/xen-no_Werror.patch
+++ b/xen-no_Werror.patch
@@ -10,30 +10,6 @@ diff -dur -x '*~' xen-4.1.2.orig/Config.mk xen-4.1.2/Config.mk
  HOSTCFLAGS += -fno-strict-aliasing
  
  DISTDIR     ?= $(XEN_ROOT)/dist
-diff -dur -x '*~' xen-4.1.2.orig/xen/arch/x86/Rules.mk xen-4.1.2/xen/arch/x86/Rules.mk
---- xen-4.1.2.orig/xen/arch/x86/Rules.mk	2011-10-20 19:05:47.000000000 +0200
-+++ xen-4.1.2/xen/arch/x86/Rules.mk	2012-09-20 08:45:47.000000000 +0200
-@@ -17,7 +17,7 @@
- endif
- 
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
- CFLAGS += -I$(BASEDIR)/include 
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
-diff -dur -x '*~' xen-4.1.2.orig/xen/arch/x86/boot/build32.mk xen-4.1.2/xen/arch/x86/boot/build32.mk
---- xen-4.1.2.orig/xen/arch/x86/boot/build32.mk	2011-10-20 19:05:47.000000000 +0200
-+++ xen-4.1.2/xen/arch/x86/boot/build32.mk	2012-09-20 08:45:59.000000000 +0200
-@@ -4,7 +4,7 @@
- 
- $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
- 
--CFLAGS += -Werror -fno-builtin -msoft-float
-+CFLAGS += -fno-builtin -msoft-float
- 
- # NB. awk invocation is a portable alternative to 'head -n -1'
- %.S: %.bin
 --- xen-4.4.1/tools/blktap/drivers/Makefile~	2014-09-02 08:20:19.000000000 +0200
 +++ xen-4.4.1/tools/blktap/drivers/Makefile	2014-12-13 19:19:17.070688454 +0100
 @@ -4,7 +4,6 @@
diff --git a/xen.spec b/xen.spec
index 239961d..edd7cd6 100644
--- a/xen.spec
+++ b/xen.spec
@@ -115,6 +115,7 @@ Patch16:	%{name}-gmp-abi.patch
 # based on: http://xenbits.xen.org/xsa/xsa99.patch
 Patch17:	xsa99.patch
 Patch18:	%{name}-make.patch
+Patch19:	%{name}-no_Werror.patch
 URL:		http://www.xen.org/products/xenhyp.html
 %if %{with qemu_traditional}
 %{?with_opengl:BuildRequires:	OpenGL-devel}
@@ -423,6 +424,7 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z firmware
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 # stubdom sources
 ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom