rpms/sbcl/devel 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
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Jul 30 14:35:42 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21068
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
Log Message:
* Wed Jul 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.18-1
- sbcl-1.0.19
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/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore 28 May 2008 13:18:46 -0000 1.38
+++ .cvsignore 30 Jul 2008 14:35:12 -0000 1.39
@@ -1 +1 @@
-sbcl-1.0.17-source.tar.bz2
+sbcl-1.0.19-source.tar.bz2
Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sbcl.spec 17 Jun 2008 00:19:45 -0000 1.90
+++ sbcl.spec 30 Jul 2008 14:35:12 -0000 1.91
@@ -12,8 +12,8 @@
Name: sbcl
Summary: Steel Bank Common Lisp
-Version: 1.0.17
-Release: 3%{?dist}
+Version: 1.0.19
+Release: 1%{?dist}
License: BSD
Group: Development/Languages
@@ -71,7 +71,7 @@
Source100: my_setarch.c
-Patch1: sbcl-0.8.18-default-sbcl-home.patch
+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
@@ -103,7 +103,7 @@
#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
@@ -121,7 +121,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 +135,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,7 +156,7 @@
%{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap}
# docs
-%if "%{?min_bootstrap}" == "%{nil}"
+%if "x%{?min_bootstrap}" == "x%{nil}"
make -C doc/manual html info
%endif
@@ -200,7 +200,7 @@
find %{buildroot} -name 'test-passed' | xargs rm -vf
-%if "%{?min_bootstrap}" == "%{nil}"
+%if "x%{?min_bootstrap}" == "x%{nil}"
%post
/sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||:
/sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||:
@@ -225,7 +225,7 @@
%{_bindir}/*
%{_libdir}/sbcl/
%{_mandir}/man?/*
-%if "%{?min_bootstrap}" == "%{nil}"
+%if "x%{?min_bootstrap}" == "x%{nil}"
%doc doc/manual/sbcl
%doc doc/manual/asdf
%{_infodir}/*
@@ -237,6 +237,9 @@
%changelog
+* Wed Jul 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.18-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/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources 28 May 2008 13:18:46 -0000 1.39
+++ sources 30 Jul 2008 14:35:12 -0000 1.40
@@ -1 +1 @@
-6f1858c98370e06f5cca7bd95227c69e sbcl-1.0.17-source.tar.bz2
+c84b4b3c2f4293e98f0941a43fb746f4 sbcl-1.0.19-source.tar.bz2
--- sbcl-0.8.18-default-sbcl-home.patch DELETED ---
More information about the fedora-extras-commits
mailing list