rpms/sbcl/FC-3 .cvsignore, 1.3, 1.4 sbcl-0.9.4-LIB_DIR.patch, 1.2, 1.3 sbcl.spec, 1.16, 1.17 sources, 1.3, 1.4

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17093

Modified Files:
	.cvsignore sbcl-0.9.4-LIB_DIR.patch sbcl.spec sources 
Log Message:
* Thu Sep 29 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-15
- enable sb-thread
- set EXTRA_CFLAGS to so optflags are used for building contrib/ too
- hope that a rebuild will include missing sb-posix (bz #169506)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Sep 2005 01:23:44 -0000	1.3
+++ .cvsignore	29 Sep 2005 17:59:33 -0000	1.4
@@ -1,4 +1,4 @@
 sbcl-0.9.5-source.tar.bz2
 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-sbcl-0.9.4-x86-linux-binary.tar.bz2
+sbcl-0.9.5-x86-linux-binary.tar.bz2

sbcl-0.9.4-LIB_DIR.patch:

Index: sbcl-0.9.4-LIB_DIR.patch
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl-0.9.4-LIB_DIR.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sbcl-0.9.4-LIB_DIR.patch	13 Sep 2005 16:50:44 -0000	1.2
+++ sbcl-0.9.4-LIB_DIR.patch	29 Sep 2005 17:59:33 -0000	1.3
@@ -31,7 +31,7 @@
  echo "SBCL has been installed:"
  echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/sbcl"
 -echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/"
-+echo " core and contribs in $BUILD_ROOT$LIB_DIR"
++echo " core and contribs in $BUILD_ROOT$LIB_DIR/sbcl"
  
  # Installing manual & misc bits of documentation
  #


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sbcl.spec	28 Sep 2005 01:23:44 -0000	1.16
+++ sbcl.spec	29 Sep 2005 17:59:33 -0000	1.17
@@ -3,7 +3,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.5
-Release: 8%{?dist}
+Release: 15%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -12,8 +12,12 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: %{ix86} x86_64
 
+# Pre-generated html docs (not used)
+#Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
+Source2: customize-target-features.lisp 
+
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.5-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -31,7 +35,7 @@
 ## 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
+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 
@@ -47,12 +51,16 @@
 Patch2: sbcl-0.9.5-personality.patch
 Patch3: sbcl-0.9.5-optflags.patch
 Patch4: sbcl-0.9.4-LIB_DIR.patch
+Patch5: sbcl-0.9.5-make-config-fix.patch
+Patch6: sbcl-0.9.5-verbose-build.patch
+Patch7: sbcl-0.9.5-stdlib_h.patch
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 # doc generation
 BuildRequires: ghostscript
 BuildRequires: texinfo
+BuildRequires: time
 
 %description
 Steel Bank Common Lisp (SBCL) is a Open Source development environment
@@ -63,24 +71,28 @@
 %prep
 %setup -q %{?sbcl_bootstrap_src} 
 
+# Handle pre-generated docs
+if [ -d %{name}-%{version}/doc/manual ]; then
+  mv %{name}-%{version}/doc/manual/* doc/manual/
+fi
+
 #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
 #or patch to use SBCL_HOME env var
 %patch1 -p0 -b .default-sbcl-home
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
+%patch5 -p1 -b .make-config-fix
+%patch6 -p1 -b .verbose-build
+%patch7 -p1 -b .stdlib_h
 
-# http://article.gmane.org/gmane.lisp.steel-bank.general/340
-# enable threads (was only for >= 2.6, but code has checks to disable for <= 2.4)
-## FIXME(?): per section 2.2 of INSTALL, should create/use customize-target-features.lisp
-## to customize features -- Rex
-#define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 )
-#if "%{?kernel_ver}" >= "2.6"
+# Enable sb-thread
 %ifarch %{ix86} x86_64
 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
+cp %{SOURCE2} ./customize-target-features.lisp
 %endif
-#endif
 
+# "install" local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
 pushd sbcl-*-linux
@@ -89,26 +101,28 @@
 popd
 %endif
 
-# CVS crud 
-find . -name CVS -type d | xargs rm -rf
-find . -name '.cvsignore' | xargs rm -f
 # fix permissions (some have eXecute bit set)
 find . -name '*.c' | xargs chmod 644
 
 
 %build
-export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 
+# setup local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
 export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
+%endif
 
+# my_setarch, to set personality, (about) the same as setarch -R, 
+# but usable on fc3 too
 %{__cc} -o my_setarch %{optflags} %{SOURCE100} 
 %define my_setarch ./my_setarch
-%endif
 
+# trick contrib/ modules to use optflags too 
+export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
-%{?setarch} %{?my_setarch} ./make.sh %{?bootstrap}
+%{?setarch} %{?my_setarch} sh -x ./make.sh %{?bootstrap}
 
 # docs
 make -C doc/manual html info
@@ -116,7 +130,12 @@
 
 %check || :
 pushd tests 
+# Only x86 builds are expected to pass all
+%ifarch %{ix86} x86_64
 %{?setarch} sh ./run-tests.sh
+%else
+%{?setarch} sh ./run-tests.sh ||:
+%endif
 popd
 
 
@@ -124,16 +143,20 @@
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}}
-unset SBCL_HOME ||:
-export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix}
-export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
-sh ./install.sh
+
+unset SBCL_HOME 
+export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} 
+export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} 
+sh -x ./install.sh 
 
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
-# from make check
-find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
+# CVS crud 
+find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
+find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f
+# 'test-passed' files from make check (leave these in, for now -- Rex)
+# find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
 
 
 %post
@@ -165,6 +188,14 @@
 
 
 %changelog
+* Thu Sep 29 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-15
+- enable sb-thread
+- set EXTRA_CFLAGS to so optflags are used for building contrib/ too
+- hope that a rebuild will include missing sb-posix (bz #169506)
+
+* Wed Sep 28 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-14
+- more ppc work
+
 * Tue Sep 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-8
 - respin (fc3/fc4)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2005 01:23:44 -0000	1.3
+++ sources	29 Sep 2005 17:59:33 -0000	1.4
@@ -1,4 +1,4 @@
 f594f18813c08f262a6df9a36288adcb  sbcl-0.9.5-source.tar.bz2
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 67ec41e624a3f2ad7f6f3cde1bd001d3  sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-947d1cde2c1c80416b5f9fb4e4c81383  sbcl-0.9.4-x86-linux-binary.tar.bz2
+cb01b462b517889723eeaf63b5474c70  sbcl-0.9.5-x86-linux-binary.tar.bz2