rpms/sbcl/devel sbcl-install-clc.lisp, NONE, 1.1 sbcl.rc, NONE, 1.1 sbcl.sh, 1.5, 1.6 sbcl.spec, 1.94, 1.95
Anthony Green
green at fedoraproject.org
Sun Sep 21 12:42:14 UTC 2008
- Previous message (by thread): rpms/tennix/devel import.log,1.2,1.3
- Next message (by thread): rpms/tennix/F-8 import.log, NONE, 1.1 tennix.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: green
Update of /cvs/pkgs/rpms/sbcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15364
Modified Files:
sbcl.spec
Added Files:
sbcl-install-clc.lisp sbcl.rc sbcl.sh
Log Message:
Add common-lisp-controller support
--- 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 Sep 2008 12:41:43 -0000 1.6
@@ -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: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- sbcl.spec 2 Sep 2008 14:25:41 -0000 1.94
+++ sbcl.spec 21 Sep 2008 12:41:43 -0000 1.95
@@ -13,7 +13,7 @@
Name: sbcl
Summary: Steel Bank Common Lisp
Version: 1.0.20
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Development/Languages
@@ -27,6 +27,9 @@
ExclusiveArch: i386 x86_64 ppc sparc
%endif
+BuildRequires: common-lisp-controller
+Requires: common-lisp-controller
+
# Pre-generated html docs (not used)
#Source1: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
Source2: customize-target-features.lisp
@@ -71,6 +74,10 @@
Source100: my_setarch.c
+Source200: sbcl.sh
+Source201: sbcl.rc
+Source202: sbcl-install-clc.lisp
+
Patch1: sbcl-1.0.19-default-sbcl-home.patch
Patch2: sbcl-0.9.5-personality.patch
Patch3: sbcl-1.0.16-optflags.patch
@@ -199,16 +206,22 @@
# 'test-passed' files from %%check
find %{buildroot} -name 'test-passed' | xargs rm -vf
+install -m 744 %{SOURCE200} %{buildroot}%{_libdir}/common-lisp/bin
+install -m 644 %{SOURCE201} %{buildroot}%{_sysconfdir}/sbcl.rc
+install -m 644 %{SOURCE202} %{buildroot}%{_libdir}/sbcl/install-clc.lisp
+cp %{buildroot}%{_libdir}/sbcl/sbcl.core %{buildroot}%{_libdir}/sbcl/sbcl-dist.core
%if "x%{?min_bootstrap}" == "x%{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
@@ -229,6 +242,8 @@
%doc doc/manual/sbcl
%doc doc/manual/asdf
%{_infodir}/*
+%{_libdir}/common-lisp/bin/*
+%{_sysconfdir}/*
%endif
@@ -237,6 +252,9 @@
%changelog
+* 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
- Previous message (by thread): rpms/tennix/devel import.log,1.2,1.3
- Next message (by thread): rpms/tennix/F-8 import.log, NONE, 1.1 tennix.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list