rpms/cmucl/devel cmucl.spec, 1.19, 1.20 cmucl-19e-gcc43.patch, 1.1, NONE cmucl-19e-optflags.patch, 1.2, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/cmucl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1097

Modified Files:
	cmucl.spec 
Removed Files:
	cmucl-19e-gcc43.patch cmucl-19e-optflags.patch 
Log Message:
- fix build (move sources outside of %ifarch)
- drop deprecated patches
- build both x87 and sse2 cores (to match upstream practice)



Index: cmucl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmucl/devel/cmucl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- cmucl.spec	18 Mar 2009 14:36:12 -0000	1.19
+++ cmucl.spec	18 Mar 2009 19:14:37 -0000	1.20
@@ -17,13 +17,14 @@
 # bootstrap available for %%ix86 only: http://bugzilla.redhat.com/185085
 ExclusiveArch: %{ix86}
 
+Source10: http://common-lisp.net/project/cmucl/downloads/release/19f/cmucl-19f-x86-linux.tar.bz2
+Source11: http://common-lisp.net/project/cmucl/downloads/release/19f/cmucl-19f-x86-linux.tar.bz2.asc
+
 ## ix86 section
 %ifarch %{ix86}
 %define cmucl_arch x86
 #define bootstrap cmucl 
 %if "%{?bootstrap}" == "%{nil}"
-Source10: http://common-lisp.net/project/cmucl/downloads/release/19f/cmucl-19f-x86-linux.tar.bz2
-Source11: http://common-lisp.net/project/cmucl/downloads/release/19f/cmucl-19f-x86-linux.tar.bz2.asc
 %define bootstrap_src -a 10 
 %else
 BuildRequires: cmucl = 19e
@@ -39,8 +40,6 @@
 #ifarch ppc
 #endif
 
-Patch2: cmucl-19e-optflags.patch
-
 BuildRequires: sed
 BuildRequires: time
 BuildRequires: bc
@@ -73,11 +72,11 @@
 %prep
 %setup -q -c %{name}-%{version} %{?bootstrap_src}
 
-#patch2 -p1 -b .optflags
-
 
 %build
 
+CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
+
 %if 0%{?bootfile:1}
 pushd src/bootfiles/19e
 cat \
@@ -97,8 +96,17 @@
   -b %{_target_platform} \
   %{?bootfile} \
   -C "linux_gencgc %{cmucl_arch}" \
+  -f x87 \
+  -v "%{version} Fedora release %{release}" \
+  %{!?bootstrap:-o "bin/lisp -noinit -batch -fpu x87"} 
+
+./src/tools/build.sh \
+  -b %{_target_platform} \
+  %{?bootfile} \
+  -C "linux_gencgc %{cmucl_arch}" \
+  -f sse2 \
   -v "%{version} Fedora release %{release}" \
-  %{!?bootstrap:-o "bin/lisp -noinit -batch"} 
+  %{!?bootstrap:-o "bin/lisp -noinit -batch -fpu sse2"}
 
 # make binary dist archives
 ./src/tools/make-dist.sh %{_target_platform}-4 %{version} %{cmucl_arch} linux
@@ -170,6 +178,7 @@
 %{_libdir}/cmucl/bin/
 %dir %{_libdir}/cmucl/lib
 %{_libdir}/cmucl/lib/lisp-x87.core
+%{_libdir}/cmucl/lib/lisp-sse2.core
 %{_libdir}/cmucl/lib/load-foreign.csh
 %{_libdir}/cmucl/lib/config
 %{_libdir}/cmucl/lib/config.lisp
@@ -208,6 +217,7 @@
 %changelog
 * Wed Mar 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 19f-1
 - cmucl-19f
+- build both x87 and sse2 cores
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 19e-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


--- cmucl-19e-gcc43.patch DELETED ---


--- cmucl-19e-optflags.patch DELETED ---