rpms/xen/devel xen-3.0.1-m64.patch,NONE,1.1 xen.spec,1.98,1.99

[fedora-cvs-commits redhat com]

Author: riel

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19742

Modified Files:
	xen.spec 
Added Files:
	xen-3.0.1-m64.patch 
Log Message:
fix 64 bit CFLAGS issue with vmxloader and hvmloader

xen-3.0.1-m64.patch:
 hvmloader/Makefile |    3 +++
 vmxassist/Makefile |    3 +++
 2 files changed, 6 insertions(+)

--- NEW FILE xen-3.0.1-m64.patch ---
--- xen-3.0.1/tools/firmware/vmxassist/Makefile.m64	2006-02-28 10:14:19.000000000 -0500
+++ xen-3.0.1/tools/firmware/vmxassist/Makefile	2006-03-02 10:49:53.000000000 -0500
@@ -27,6 +27,9 @@
 DEFINES=-DDEBUG -DTEXTADDR=$(TEXTADDR)
 XENINC=-I$(XEN_ROOT)/tools/libxc
 
+# vmxloader is a 32 bit program
+CFLAGS=$(echo "$CFLAGS" | sed -e 's/ -m64//g')
+
 # Disable PIE/SSP if GCC supports them. They can break us.
 CFLAGS  += $(call test-gcc-flag,$(CC),-nopie)
 CFLAGS  += $(call test-gcc-flag,$(CC),-fno-stack-protector)
--- xen-3.0.1/tools/firmware/hvmloader/Makefile.m64	2006-03-02 10:52:21.000000000 -0500
+++ xen-3.0.1/tools/firmware/hvmloader/Makefile	2006-03-02 10:52:54.000000000 -0500
@@ -29,6 +29,9 @@
 
 OBJECTS	 = hvmloader.o acpi_madt.o 
 
+# hvmloader is a 32 bit program
+CFLAGS=$(echo "$CFLAGS" | sed -e 's/ -m64//g')
+
 # Disable PIE/SSP if GCC supports them. They can break us.
 CFLAGS  += $(call test-gcc-flag,$(CC),-nopie)
 CFLAGS  += $(call test-gcc-flag,$(CC),-fno-stack-protector)


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- xen.spec	1 Mar 2006 23:04:59 -0000	1.98
+++ xen.spec	2 Mar 2006 15:46:58 -0000	1.99
@@ -5,7 +5,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.1
-Release: 0.20060301.fc5.1
+Release: 0.20060301.fc5.2
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -19,6 +19,7 @@
 Patch6: xen-network-iptables-bridge.patch
 Patch8: xen-vmxballoon-hack.patch
 Patch9: xen-3.0.1-config-allow-http.patch
+Patch10: xen-3.0.1-m64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
 BuildRequires: libX11-devel python-devel ghostscript tetex-latex 
@@ -57,6 +58,7 @@
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1 
+%patch10 -p1 -b .m64
 
 cp %{SOURCE2} .
 
@@ -68,9 +70,7 @@
 popd
 
 sed -i -e "s;libvncserver-config;${vncdir}/libvncserver-config;" tools/ioemu/configure
-#CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/ -m64//g'`"
-unset CFLAGS
-%{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs 
+CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/ -m64//g'`" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs 
 
 %install
 rm -rf %{buildroot}
@@ -156,6 +156,9 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Thu Mar  2 2006 Rik van Riel <riel redhat com> - 3.0.1-0.20060301.fc5.2
+- fix 64 bit CFLAGS issue with vmxloader and hvmloader
+
 * Wed Mar  1 2006 Stephen Tweedie <sct redhat com> - 3.0.1-0.20060301.fc5.1
 - Update to xen-unstable cset 9022