rpms/sbcl/EL-4 sbcl-1.0.25-default_sbcl_home.patch, NONE, 1.1 sbcl-install-clc.lisp, NONE, 1.1 sbcl.rc, NONE, 1.1 sbcl.sh, 1.4, 1.5 .cvsignore, 1.22, 1.23 sbcl.spec, 1.49, 1.50 sources, 1.24, 1.25 sbcl-1.0.16-optflags.patch, 1.1, NONE sbcl-1.0.19-default-sbcl-home.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Mon Dec 21 19:51:30 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/sbcl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20606
Modified Files:
.cvsignore sbcl.spec sources
Added Files:
sbcl-1.0.25-default_sbcl_home.patch sbcl-install-clc.lisp
sbcl.rc sbcl.sh
Removed Files:
sbcl-1.0.16-optflags.patch sbcl-1.0.19-default-sbcl-home.patch
Log Message:
sync w/F-12 branch for sbcl-1.0.30
sbcl-1.0.25-default_sbcl_home.patch:
make-target-1.sh | 23 +++++++++++++++++++++++
src/runtime/runtime.c | 4 +---
2 files changed, 24 insertions(+), 3 deletions(-)
--- 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;
--- NEW FILE sbcl-install-clc.lisp ---
;;; -*- Mode: LISP; Package: CL-USER -*-
;;;
;;; Copyright (C) Peter Van Eynde 2001 and Kevin Rosenberg 2002-2003
;;;
;;; License: LGPL v2
;;;
(in-package "COMMON-LISP-USER")
(handler-case
(load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
(error (e)
(format t "~%Error during load of common-lisp-controller.lisp: ~A~%" e)
(sb-unix:unix-exit 1)))
(handler-case
(common-lisp-controller:init-common-lisp-controller-v4 "sbcl")
(error (e)
(format t "~%Error running init-common-lisp-controller-v4: ~A~%" e)
(sb-unix:unix-exit 1)))
(when (probe-file #p"/etc/lisp.config")
(load #p"/etc/lisp.config"))
(setf (logical-pathname-translations "SYS")
'(("SYS:**;*.*.*"
#P"/usr/share/sbcl-source/**/*.*")))
(set-dispatch-macro-character #\# #\!
(lambda (stream bang arg)
(declare (ignore bang arg))
(read-line stream)
(values)))
(ignore-errors
(format t "~%Saving to sbcl-new.core...")
(sb-ext:gc :full t)
(sb-ext:save-lisp-and-die "sbcl-new.core"))
--- NEW FILE sbcl.rc ---
;;; -*- Lisp -*-
;;; this file gets installed as /etc/sbcl.rc and run on every
;;; invocation of sbcl
(if (probe-file "/etc/lisp-config.lisp")
(load "/etc/lisp-config.lisp")
(format t "~%;;; Hey: there is no /etc/lisp-config.lisp file, please create one."))
Index: sbcl.sh
===================================================================
RCS file: sbcl.sh
diff -N sbcl.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sbcl.sh 21 Dec 2009 19:51:30 -0000 1.5
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
+ cat <<EOF
+OF
+$0: cannot find the common-lisp-controller source.
+EOF
+ exit 0
+fi
+
+build_error()
+{
+ echo "Build failure $1"
+ exit 1
+}
+
+if [ -f /etc/sbcl.rc ] ; then
+ RCFILE=/etc/sbcl.rc
+else
+ RCFILE=/dev/null
+fi
+
+case $1 in
+ install-clc)
+ echo $0 loading and dumping clc.
+ ( cd /usr/lib/sbcl
+ /usr/bin/sbcl --core /usr/lib/sbcl/sbcl-dist.core \
+ --noinform --sysinit ${RCFILE} --userinit /dev/null \
+ --load "/usr/lib/sbcl/install-clc.lisp" # 2> /dev/null
+ mv sbcl-new.core sbcl.core || (echo FAILED ; cp sbcl-dist.core sbcl.core ) )
+ ;;
+ remove-clc)
+ echo $0 removing clc-enabled image
+ cp /usr/lib/sbcl/sbcl-dist.core /usr/lib/sbcl/sbcl.core
+ ;;
+ rebuild)
+ echo $0 rebuilding...
+ shift
+ echo rebuilding $1
+ /usr/bin/sbcl --noinform --sysinit ${RCFILE} --userinit /dev/null \
+ --disable-debugger \
+ --eval \
+"(handler-case
+ (progn
+ (asdf:operate 'asdf:compile-op (quote $1))
+ (sb-unix:unix-exit 0))
+ (error (e)
+ (ignore-errors (format t \"~&Build error: ~A~%\" e))
+ (finish-output)
+ (sb-unix:unix-exit 1)))" || build_error
+ ;;
+ remove)
+ echo $0 removing packages...
+ shift
+ while [ ! -z "$1" ] ; do
+rm -rf "/var/cache/common-lisp-controller/*/sbcl/${1}"
+shift
+ done
+ ;;
+ *)
+ echo $0 unkown command $1
+ echo known commands: rebuild, remove, install-clc, and remove-clc
+ exit 1
+ ;;
+esac
+
+exit 0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/EL-4/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore 5 Nov 2008 17:31:44 -0000 1.22
+++ .cvsignore 21 Dec 2009 19:51:29 -0000 1.23
@@ -1 +1 @@
-sbcl-1.0.22-source.tar.bz2
+sbcl-1.0.30-source.tar.bz2
Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/EL-4/sbcl.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sbcl.spec 5 Nov 2008 17:31:44 -0000 1.49
+++ sbcl.spec 21 Dec 2009 19:51:30 -0000 1.50
@@ -8,12 +8,15 @@
%define sbcl_shell /bin/bash
# threading support
-%{?!_without_threads:%define _with_threads --with-threads}
+## Enable sb-thread
+%ifarch %{ix86} x86_64
+%{?!_without_threads:%global _with_threads --with-threads}
+%endif
Name: sbcl
Summary: Steel Bank Common Lisp
-Version: 1.0.22
-Release: 1%{?dist}
+Version: 1.0.30
+Release: 1%{?dist}.2
License: BSD
Group: Development/Languages
@@ -22,13 +25,13 @@ Source0: http://downloads.sourceforge.ne
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 8
# reinclude ppc when fixed: http://bugzilla.redhat.com/448734
-ExclusiveArch: i386 x86_64 sparcv9
+ExclusiveArch: %{ix86} x86_64 sparcv9
%else
-ExclusiveArch: i386 x86_64 ppc sparcv9
+ExclusiveArch: %{ix86} x86_64 ppc sparcv9
%endif
# Pre-generated html docs (not used)
-#Source1: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
+#Source1: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-documentation-html.tar.bz2
Source2: customize-target-features.lisp
## x86 section
@@ -81,14 +84,16 @@ Source201: sbcl.rc
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
+Patch3: sbcl-1.0.30-optflags.patch
Patch4: sbcl-0.9.17-LIB_DIR.patch
Patch6: sbcl-0.9.5-verbose-build.patch
# Allow override of contrib test failure(s)
Patch7: sbcl-1.0.2-permissive.patch
+## upstream patches
+
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
# doc generation
@@ -103,16 +108,16 @@ interpreter, and debugger.
%prep
-%setup -q %{?sbcl_bootstrap_src}
+%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
+#sed -i -e "s|/usr/local/lib/sbcl/|%{_prefix}/lib/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
@@ -121,12 +126,10 @@ fi
%if 0%{?_with_threads:1}
## Enable sb-thread
-%ifarch %{ix86} x86_64
#sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
# or
install -m644 -p %{SOURCE2} ./customize-target-features.lisp
%endif
-%endif
# "install" local bootstrap
%if "x%{?sbcl_bootstrap_src}" != "x%{nil}"
@@ -139,6 +142,9 @@ popd
# fix permissions (some have eXecute bit set)
find . -name '*.c' | xargs chmod 644
+# set version.lisp-expr
+sed -i.rpmver -e "s|\"%{version}\"|\"%{version}-%{release}\"|" version.lisp-expr
+
%build
@@ -159,7 +165,13 @@ export PATH=`pwd`/sbcl-bootstrap/bin:${P
# http://bugzilla.redhat.com/214568
#touch contrib/sb-bsd-sockets/test-passed
-export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
+# WORKAROUND ppc linker issue
+%ifarch ppc
+#export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall";
+#echo "RPM_OPT_FLAGS: $RPM_OPT_FLAGS"
+%endif
+
+export DEFAULT_SBCL_HOME=%{_prefix}/lib/sbcl
%{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
%{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap}
@@ -172,7 +184,7 @@ ERROR=0
# santity check, essential contrib modules get built/included?
CONTRIBS="sb-posix sb-bsd-sockets"
for CONTRIB in $CONTRIBS ; do
- if [ ! -d %{buildroot}%{_libdir}/sbcl/$CONTRIB ]; then
+ if [ ! -d %{buildroot}%{_prefix}/lib/sbcl/$CONTRIB ]; then
echo "WARNING: ${CONTRIB} awol!"
ERROR=1
echo "ulimit -a"
@@ -191,19 +203,19 @@ exit $ERROR
%install
rm -rf %{buildroot}
-mkdir -p %{buildroot}{%{_bindir},%{_libdir},%{_mandir}}
+mkdir -p %{buildroot}{%{_bindir},%{_prefix}/lib,%{_mandir}}
unset SBCL_HOME
export INSTALL_ROOT=%{buildroot}%{_prefix}
-export LIB_DIR=%{buildroot}%{_libdir}
+export LIB_DIR=%{buildroot}%{_prefix}/lib
%{?sbcl_shell} ./install.sh
%if 0%{?common_lisp_controller}
-install -m744 -p -D %{SOURCE200} %{buildroot}%{_libdir}/common-lisp/bin/sbcl.sh
+install -m744 -p -D %{SOURCE200} %{buildroot}%{_prefix}/lib/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
+install -m644 -p -D %{SOURCE202} %{buildroot}%{_prefix}/lib/sbcl/install-clc.lisp
# linking ok? -- Rex
-cp -p %{buildroot}%{_libdir}/sbcl/sbcl.core %{buildroot}%{_libdir}/sbcl/sbcl-dist.core
+cp -p %{buildroot}%{_prefix}/lib/sbcl/sbcl.core %{buildroot}%{_prefix}/lib/sbcl/sbcl-dist.core
%endif
## Unpackaged files
@@ -216,6 +228,7 @@ find %{buildroot} -name .cvsignore | xar
find %{buildroot} -name 'test-passed' | xargs rm -vf
+## FIXME! register-common-lisp-implementation fails (at least on x86_64)
%post
/sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||:
/sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||:
@@ -232,15 +245,15 @@ fi
%files
%defattr(-,root,root)
%doc BUGS COPYING README CREDITS NEWS TLA TODO
-%doc SUPPORT STYLE PRINCIPLES
+%doc STYLE PRINCIPLES
%{_bindir}/*
-%{_libdir}/sbcl/
+%{_prefix}/lib/sbcl/
%{_mandir}/man?/*
%doc doc/manual/sbcl
%doc doc/manual/asdf
%{_infodir}/*
%if 0%{?common_lisp_controller}
-%{_libdir}/common-lisp/bin/*
+%{_prefix}/lib/common-lisp/bin/*
%{_sysconfdir}/*
%endif
@@ -250,6 +263,41 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.30-1.2
+- customize version.lisp-expr for rpm %%release
+- s|%%_libdir|%%_prefix/lib|, so common-lisp-controller has at least
+ a chance to work
+
+* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.30-1
+- sbcl-1.0.30
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.29-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jun 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.29-1
+- sbcl-1.0.29
+
+* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.28-1
+- sbcl-1.0.28
+
+* Wed Mar 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.26-1
+- sbcl-1.0.26
+
+* Fri Feb 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.25-3
+- ExclusiveArch: s/i386/%%ix86/
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.25-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* 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
+
+* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.23-1
+- sbcl-1.0.23
+
* Thu Oct 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.22-1
- sbcl-1.0.22
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/EL-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources 5 Nov 2008 17:31:44 -0000 1.24
+++ sources 21 Dec 2009 19:51:30 -0000 1.25
@@ -1 +1 @@
-fad4f6634aedadd3212804b65ac89c96 sbcl-1.0.22-source.tar.bz2
+64a96ad21a5d57f27639c0801c00fe74 sbcl-1.0.30-source.tar.bz2
--- sbcl-1.0.16-optflags.patch DELETED ---
--- sbcl-1.0.19-default-sbcl-home.patch DELETED ---
More information about the fedora-extras-commits
mailing list