Build fixes

- BR: texlive-xetex (required for some docs build)
- remove some -Werror flags from makefiles, to make it less
  fragile to compiler updates

diff --git a/xen-no_Werror.patch b/xen-no_Werror.patch
new file mode 100644 (file)
index 0000000..3d27262
--- /dev/null
+++ b/xen-no_Werror.patch
@@ -0,0 +1,36 @@
+diff -dur -x '*~' xen-4.1.2.orig/Config.mk xen-4.1.2/Config.mk
+--- xen-4.1.2.orig/Config.mk   2011-10-20 19:06:04.000000000 +0200
++++ xen-4.1.2/Config.mk        2012-09-20 08:44:53.000000000 +0200
+@@ -14,7 +14,7 @@
+ 
+ # Tools to run on system hosting the build
+ HOSTCC      = gcc
+-HOSTCFLAGS  = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
++HOSTCFLAGS  = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+ 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

diff --git a/xen.spec b/xen.spec
index 6919496fb5efd7d1b9073f29c9ade687ee4d1edc..fb2b73fd68f914a37944a9ad0ad3540450d2533f 100644 (file)
--- a/xen.spec
+++ b/xen.spec
@@ -66,6 +66,7 @@ Patch11:      xen-dumpdir.patch
 Patch12:       xen-net-disable-iptables-on-bridge.patch
 Patch13:       xen-configure-xend.patch
 Patch14:       xen-initscript.patch
+Patch15:       xen-no_Werror.patch
 # stubdom patch
 Patch100:      grub-ext4-support.patch
 URL:           http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -96,6 +97,7 @@ BuildRequires:        texi2html
 #BuildRequires:        texlive-dvips
 #BuildRequires:        texlive-latex-data
 BuildRequires: texlive-latex-psnfss
+BuildRequires: texlive-xetex
 BuildRequires: transfig
 BuildRequires: which
 BuildRequires: xorg-lib-libX11-devel
@@ -312,6 +314,7 @@ Ten pakiet zapewnia bashowe dopełnianie poleceń dla Xena (xl).
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %{__rm} -v tools/check/*.orig