SPECS: xen.spec - enable PAE by default on archs supporting it

[jajcus]

Author: jajcus                       Date: Thu Jun 29 06:30:52 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- enable PAE by default on archs supporting it

---- Files affected:
SPECS:
   xen.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: SPECS/xen.spec
diff -u SPECS/xen.spec:1.28 SPECS/xen.spec:1.29
--- SPECS/xen.spec:1.28	Wed Jun 28 10:28:58 2006
+++ SPECS/xen.spec	Thu Jun 29 08:30:46 2006
@@ -4,7 +4,7 @@
 # - script for rc-boot
 #
 # Conditional build:
-%bcond_with	pae		# build PAE (HIGHMEM64G) support (SMP kernels use it by default)
+%bcond_without	pae		# build without PAE (HIGHMEM64G) support (PLD Xen* kernels require PAE)
 #
 Summary:	Xen - a virtual machine monitor
 Summary(pl):	Xen - monitor maszyny wirtualnej
@@ -47,6 +47,12 @@
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%ifnarch i686 athlon pentium3 pentium4
+%define		with_pae	0 
+%endif
+
+
+
 %description
 This package contains the Xen hypervisor and Xen tools, needed to run
 virtual machines on x86 systems, together with the kernel-xen*
@@ -108,17 +114,17 @@
 CFLAGS="%{rpmcflags} -I/usr/include/ncurses" \
 CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses" \
 %{__make} xen tools docs \
+	%{?with_pae:XEN_TARGET_X86_PAE=y} \
 	CC="%{__cc}" \
-	CXX="%{__cxx}" \
-	%{?with_pae:XEN_TARGET_X86_PAE=y}
+	CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/run/{xen-hotplug,xend,xenstored}
 
 %{__make} install-xen install-tools install-docs \
-	DESTDIR=$RPM_BUILD_ROOT \
 	%{?with_pae:XEN_TARGET_X86_PAE=y} \
+	DESTDIR=$RPM_BUILD_ROOT \
 	XEN_PYTHON_NATIVE_INSTALL=1
 
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -217,6 +223,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2006/06/29 06:30:46  jajcus
+- enable PAE by default on archs supporting it
+
 Revision 1.28  2006/06/28 08:28:58  jajcus
 - with_pae bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xen.spec?r1=1.28&r2=1.29&f=u