rpms/sbcl/devel sbcl.spec,1.19,1.20

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1843

Modified Files:
	sbcl.spec 
Log Message:
cleanup/allow-for arch-specific build options



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sbcl.spec	27 Sep 2005 19:12:21 -0000	1.19
+++ sbcl.spec	27 Sep 2005 19:31:50 -0000	1.20
@@ -1,16 +1,9 @@
 # $Id$
 
-## Default to using a local bootstrap, 
-## define one of the following to override 
-## (non sbcl bootstraps untested)
-#define sbcl_bootstrap sbcl
-#define sbcl_bootstrap cmucl
-#define sbcl_bootstrap clisp
-
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -19,32 +12,33 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: %{ix86} x86_64 ppc
 
-%define sbcl_arch %{_target_cpu}
-
-%if "%{?sbcl_bootstrap}" == "%{nil}"
-# local Bootstrap binaries
+## x86 section
 #Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
-%define sbcl_bootstrap sbcl
+%define sbcl_arch x86
+BuildRequires: sbcl
 #define sbcl_bootstrap_src -a 10 
 %endif
+
+## x86_64 section
 #Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
-%define sbcl_bootstrap sbcl
+BuildRequires: sbcl
 #define sbcl_bootstrap_src -a 20 
 %endif
+
+## ppc section
 # Latest powerpc-linux bootstrap, busted:
 # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log
 Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 # another possible ppc bootstrap to try
 #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 %ifarch ppc 
+%define sbcl_arch ppc
+%define sbcl_bootstrap_src -a 30
 BuildRequires: setarch
 %define setarch setarch %{_target_cpu}
-%undefine sbcl_bootstrap
-%define sbcl_bootstrap_src -a 30 
-%endif
 %endif
 
 Source100: my_setarch.c
@@ -54,9 +48,6 @@
 Patch3: sbcl-0.9.4-optflags.patch
 Patch4: sbcl-0.9.4-LIB_DIR.patch
 
-BuildRequires: setarch
-%{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}}
-
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 # doc generation
@@ -90,7 +81,7 @@
 %endif
 #endif
 
-%if "%{?sbcl_bootstrap}" == "%{nil}"
+%if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
 pushd sbcl-*-linux
 chmod +x install.sh
@@ -108,7 +99,7 @@
 %build
 export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 
-%if "%{?sbcl_bootstrap}" == "%{nil}"
+%if "%{?sbcl_bootstrap_src}" != "%{nil}"
 export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
 export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
 
@@ -174,8 +165,9 @@
 
 
 %changelog
-* Tue Sep 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-4
-- ppc needs SBCL_ARCH and(or?) setarch
+* Tue Sep 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-5
+- set/use SBCL_ARCH/setarch (esp on ppc)
+- allow arch-specific build-options
 
 * Tue Sep 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-2
 - 0.9.5