rpms/sbcl/devel sbcl-1.0.25-default_sbcl_home.patch, NONE, 1.1 .cvsignore, 1.44, 1.45 sbcl.spec, 1.101, 1.102 sources, 1.45, 1.46 sbcl-1.0.19-default-sbcl-home.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore sbcl.spec sources 
Added Files:
	sbcl-1.0.25-default_sbcl_home.patch 
Removed Files:
	sbcl-1.0.19-default-sbcl-home.patch 
Log Message:
* Tue Feb 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.25-1
- sbcl-1.0.25


sbcl-1.0.25-default_sbcl_home.patch:

--- NEW FILE sbcl-1.0.25-default_sbcl_home.patch ---
diff -up sbcl-1.0.25/make-target-1.sh.default-sbcl-home sbcl-1.0.25/make-target-1.sh
--- sbcl-1.0.25/make-target-1.sh.default-sbcl-home	2006-04-27 11:32:42.000000000 -0500
+++ sbcl-1.0.25/make-target-1.sh	2009-02-03 08:18:10.000000000 -0600
@@ -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
diff -up sbcl-1.0.25/src/runtime/runtime.c.default-sbcl-home sbcl-1.0.25/src/runtime/runtime.c
--- sbcl-1.0.25/src/runtime/runtime.c.default-sbcl-home	2009-01-25 18:56:09.000000000 -0600
+++ sbcl-1.0.25/src/runtime/runtime.c	2009-02-03 08:19:24.000000000 -0600
@@ -66,9 +66,7 @@
 #include "interr.h"
 #endif
 
-#ifndef SBCL_HOME
-#define SBCL_HOME "/usr/local/lib/sbcl/"
-#endif
+#include "sbcl-home.h"
 
 #ifdef LISP_FEATURE_HPUX
 extern void *return_from_lisp_stub;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	31 Dec 2008 21:24:52 -0000	1.44
+++ .cvsignore	3 Feb 2009 14:35:52 -0000	1.45
@@ -1 +1 @@
-sbcl-1.0.24-source.tar.bz2
+sbcl-1.0.25-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sbcl.spec	31 Dec 2008 21:24:52 -0000	1.101
+++ sbcl.spec	3 Feb 2009 14:35:53 -0000	1.102
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 1.0.24
+Version: 1.0.25
 Release: 1%{?dist}
 
 License: BSD
@@ -81,7 +81,7 @@
 Source202: sbcl-install-clc.lisp
 %endif
 
-Patch1: sbcl-1.0.19-default-sbcl-home.patch
+Patch1: sbcl-1.0.25-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
@@ -112,7 +112,7 @@
 
 #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
 #or patch to use SBCL_HOME env var
-%patch1 -p1 -b .default-sbcl-home
+%patch1 -p1 -b .default_sbcl_home
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
@@ -250,6 +250,9 @@
 
 
 %changelog
+* Tue Feb 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.25-1
+- sbcl-1.0.25
+
 * Wed Dec 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.24-1
 - sbcl-1.0.24
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	31 Dec 2008 21:24:52 -0000	1.45
+++ sources	3 Feb 2009 14:35:53 -0000	1.46
@@ -1 +1 @@
-7ac79e6e66121dc7bde881c67b88693f  sbcl-1.0.24-source.tar.bz2
+676571e0b0d6ad63a1716102ad582afe  sbcl-1.0.25-source.tar.bz2


--- sbcl-1.0.19-default-sbcl-home.patch DELETED ---