rpms/sbcl/F-9 sbcl-1.0.19-default-sbcl-home.patch, NONE, 1.1 .cvsignore, 1.38, 1.39 sbcl.spec, 1.90, 1.91 sources, 1.39, 1.40 sbcl-0.8.18-default-sbcl-home.patch, 1.1, NONE sbcl-1.0.16-GNU_SOURCE.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/sbcl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5945

Modified Files:
	.cvsignore sbcl.spec sources 
Added Files:
	sbcl-1.0.19-default-sbcl-home.patch 
Removed Files:
	sbcl-0.8.18-default-sbcl-home.patch 
	sbcl-1.0.16-GNU_SOURCE.patch 
Log Message:
* Thu Oct 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.22-1
- sbcl-1.0.22


sbcl-1.0.19-default-sbcl-home.patch:

--- NEW FILE sbcl-1.0.19-default-sbcl-home.patch ---
diff -up sbcl-1.0.19/src/runtime/runtime.c.default-sbcl-home sbcl-1.0.19/src/runtime/runtime.c
--- sbcl-1.0.19/src/runtime/runtime.c.default-sbcl-home	2008-05-15 10:37:50.000000000 -0500
+++ sbcl-1.0.19/src/runtime/runtime.c	2008-07-30 09:20:33.000000000 -0500
@@ -66,9 +66,7 @@
 #include "interr.h"
 #endif
 
-#ifndef SBCL_HOME
-#define SBCL_HOME "/usr/local/lib/sbcl/"
-#endif
+#include "sbcl-home.h"
 
 
 /* SIGINT handler that invokes the monitor (for when Lisp isn't up to it) */
diff -up sbcl-1.0.19/make-target-1.sh.default-sbcl-home sbcl-1.0.19/make-target-1.sh
--- sbcl-1.0.19/make-target-1.sh.default-sbcl-home	2006-01-09 07:00:18.000000000 -0600
+++ sbcl-1.0.19/make-target-1.sh	2008-07-30 09:20:33.000000000 -0500
@@ -20,6 +20,29 @@ LANG=C
 LC_ALL=C
 export LANG LC_ALL
 
+# Allow the definition of INSTALL_ROOT and/or SBCL_HOME to correctly
+# set the hard-coded SBCL_HOME macro in src/runtime/runtime.c
+
+DEFAULT_SBCL_HOME=${DEFAULT_SBCL_HOME:-/usr/local/lib/sbcl/}
+
+# Strip off any trailing / on the name; we'll add this later but don't
+# need two
+DEFAULT_SBCL_HOME=${DEFAULT_SBCL_HOME%/}
+
+export DEFAULT_SBCL_HOME
+
+file=src/runtime/sbcl-home.h
+echo "/* This is a machine-generated file.            */" > $file
+echo "/* Please do not edit it by hand.               */" >> $file
+echo "/* Change the default SBCL_HOME by setting the  */" >> $file
+echo "/* DEFAULT_SBCL_HOME environment variable prior */" >> $file
+echo "/* to building. See make-target-1.sh for more   */" >> $file
+echo "/* information.                                 */" >> $file
+echo "#ifndef SBCL_HOME" >> $file
+echo "#define SBCL_HOME \"$DEFAULT_SBCL_HOME/\"" >> $file
+echo "#endif" >> $file
+
+
 # Build the runtime system and symbol table (.nm) file.
 #
 # (This C build has to come after the first genesis in order to get


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/F-9/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	28 May 2008 14:22:11 -0000	1.38
+++ .cvsignore	5 Nov 2008 17:13:53 -0000	1.39
@@ -1 +1 @@
-sbcl-1.0.17-source.tar.bz2
+sbcl-1.0.22-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/F-9/sbcl.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sbcl.spec	26 Sep 2008 18:43:25 -0000	1.90
+++ sbcl.spec	5 Nov 2008 17:13:53 -0000	1.91
@@ -1,7 +1,7 @@
 
-# build only a minimal sbcl whose sole-purpose is to be bootstrap
-# for a future sbcl build
-#define min_bootstrap 1
+%if 0%{?fedora} > 9
+%define common_lisp_controller 1
+%endif
 
 # define to enable verbose build for debugging
 #define sbcl_verbose 1 
@@ -12,8 +12,8 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 1.0.17
-Release: 3%{?dist}
+Version: 1.0.22
+Release: 1%{?dist}
 
 License: BSD
 Group: 	 Development/Languages
@@ -63,7 +63,7 @@
 ## sparc section
 #Source40: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-0.9.17-sparc-linux-binary.tar.bz2
 %ifarch sparcv9
-%define sbcl_arch sparc
+%define sbcl_arch sparc 
 BuildRequires: sbcl
 # or
 #define sbcl_bootstrap_src -a 40 
@@ -71,11 +71,20 @@
 
 Source100: my_setarch.c
 
-Patch1: sbcl-0.8.18-default-sbcl-home.patch
+%if 0%{?common_lisp_controller}
+BuildRequires: common-lisp-controller
+Requires:      common-lisp-controller
+Requires(post): common-lisp-controller
+Requires(preun): common-lisp-controller
+Source200: sbcl.sh
+Source201: sbcl.rc
+Source202: sbcl-install-clc.lisp
+%endif
+
+Patch1: sbcl-1.0.19-default-sbcl-home.patch
 Patch2: sbcl-0.9.5-personality.patch
 Patch3: sbcl-1.0.16-optflags.patch
 Patch4: sbcl-0.9.17-LIB_DIR.patch
-Patch5: sbcl-1.0.16-GNU_SOURCE.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
 Patch7: sbcl-1.0.2-permissive.patch
@@ -103,11 +112,10 @@
 
 #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
+%patch1 -p1 -b .default-sbcl-home
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
-%patch5 -p1 -b .GNU_SOURCE
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
@@ -121,7 +129,7 @@
 %endif
 
 # "install" local bootstrap
-%if "%{?sbcl_bootstrap_src}" != "%{nil}"
+%if "x%{?sbcl_bootstrap_src}" != "x%{nil}"
 mkdir sbcl-bootstrap
 pushd sbcl-*-linux
 INSTALL_ROOT=`pwd`/../sbcl-bootstrap %{?sbcl_shell} ./install.sh
@@ -135,7 +143,7 @@
 %build
 
 # setup local bootstrap
-%if "%{?sbcl_bootstrap_src}" != "%{nil}"
+%if "x%{?sbcl_bootstrap_src}" != "x%{nil}"
 export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
 export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
 %endif
@@ -156,9 +164,7 @@
 %{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap}
 
 # docs
-%if "%{?min_bootstrap}" == "%{nil}"
 make -C doc/manual html info
-%endif
 
 
 %check
@@ -169,6 +175,8 @@
   if [ ! -d %{buildroot}%{_libdir}/sbcl/$CONTRIB ]; then
     echo "WARNING: ${CONTRIB} awol!"
     ERROR=1 
+    echo "ulimit -a"
+    ulimit -a
   fi
 done
 pushd tests 
@@ -190,6 +198,14 @@
 export LIB_DIR=%{buildroot}%{_libdir} 
 %{?sbcl_shell} ./install.sh 
 
+%if 0%{?common_lisp_controller}
+install -m744 -p -D %{SOURCE200} %{buildroot}%{_libdir}/common-lisp/bin/sbcl.sh
+install -m644 -p -D %{SOURCE201} %{buildroot}%{_sysconfdir}/sbcl.rc
+install -m644 -p -D %{SOURCE202} %{buildroot}%{_libdir}/sbcl/install-clc.lisp
+# linking ok? -- Rex
+cp -p %{buildroot}%{_libdir}/sbcl/sbcl.core %{buildroot}%{_libdir}/sbcl/sbcl-dist.core
+%endif
+
 ## Unpackaged files
 rm -rf %{buildroot}%{_docdir}/sbcl
 rm -f  %{buildroot}%{_infodir}/dir
@@ -200,22 +216,17 @@
 find %{buildroot} -name 'test-passed' | xargs rm -vf
 
 
-%if "%{?min_bootstrap}" == "%{nil}"
 %post
 /sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||:
 /sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||:
+/usr/sbin/register-common-lisp-implementation sbcl > /dev/null 2>&1 ||:
 
 %preun
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir ||:
   /sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir ||:
+  /usr/sbin/unregister-common-lisp-implementation sbcl > /dev/null 2>&1 ||:
 fi
-%else
-%pre
-# min_bootstrap: We *could* check for only-on-upgrade, but why bother?   (-:
-/sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir >& /dev/null ||:
-/sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir >& /dev/null ||:
-%endif
 
 
 %files
@@ -225,10 +236,12 @@
 %{_bindir}/*
 %{_libdir}/sbcl/
 %{_mandir}/man?/*
-%if "%{?min_bootstrap}" == "%{nil}"
 %doc doc/manual/sbcl
 %doc doc/manual/asdf
 %{_infodir}/*
+%if 0%{?common_lisp_controller}
+%{_libdir}/common-lisp/bin/*
+%{_sysconfdir}/*
 %endif
 
 
@@ -237,6 +250,26 @@
 
 
 %changelog
+* Thu Oct 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.22-1
+- sbcl-1.0.22
+
+* Thu Oct 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.21-1
+- sbcl-1.0.21
+- common-lisp-controller bits f10+ only (for now)
+- drop never-used min_bootstrap crud
+
+* Mon Sep 22 2008 Anthony Green <green at redhat.com> - 1.0.20-3
+- Create missing directories.
+
+* Sun Sep 21 2008 Anthony Green <green at redhat.com> - 1.0.20-2
+- Add common-lisp-controller bits.
+
+* Tue Sep 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.20-1
+- sbcl-1.0.20
+
+* Wed Jul 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.19-1
+- sbcl-1.0.19
+
 * Thu May 29 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.17-3
 - info removal should be done in %%preun (#448933)
 - omit ppc only on f9+ (#448734)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/F-9/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	28 May 2008 14:22:11 -0000	1.39
+++ sources	5 Nov 2008 17:13:53 -0000	1.40
@@ -1 +1 @@
-6f1858c98370e06f5cca7bd95227c69e  sbcl-1.0.17-source.tar.bz2
+fad4f6634aedadd3212804b65ac89c96  sbcl-1.0.22-source.tar.bz2


--- sbcl-0.8.18-default-sbcl-home.patch DELETED ---


--- sbcl-1.0.16-GNU_SOURCE.patch DELETED ---