rpms/sbcl/EL-5 sbcl-1.0.25-default_sbcl_home.patch, NONE, 1.1 sbcl-1.0.28-optflags.patch, NONE, 1.1 sbcl-install-clc.lisp, NONE, 1.1 sbcl.rc, NONE, 1.1 sbcl.sh, 1.5, 1.6 .cvsignore, 1.26, 1.27 sbcl.spec, 1.63, 1.64 sources, 1.28, 1.29 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
Wed Jul 29 20:31:39 UTC 2009
- Previous message (by thread): rpms/maxima/F-11 .cvsignore, 1.29, 1.30 maxima.spec, 1.127, 1.128 sources, 1.27, 1.28 maxima-5.9.4-gcl_setarch.patch, 1.1, NONE
- Next message (by thread): rpms/kdepimlibs/devel kdepimlibs.spec,1.94,1.95
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/sbcl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17963
Modified Files:
.cvsignore sbcl.spec sources
Added Files:
sbcl-1.0.25-default_sbcl_home.patch sbcl-1.0.28-optflags.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:
* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.30-1
- 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;
sbcl-1.0.28-optflags.patch:
contrib/asdf-module.mk | 2 ++
src/runtime/Config.ppc-linux | 2 +-
src/runtime/Config.sparc-linux | 1 +
src/runtime/Config.x86-linux | 2 ++
src/runtime/Config.x86_64-linux | 2 +-
5 files changed, 7 insertions(+), 2 deletions(-)
--- NEW FILE sbcl-1.0.28-optflags.patch ---
diff -up sbcl-1.0.28/contrib/asdf-module.mk.optflags sbcl-1.0.28/contrib/asdf-module.mk
--- sbcl-1.0.28/contrib/asdf-module.mk.optflags 2009-04-28 11:02:13.000000000 -0500
+++ sbcl-1.0.28/contrib/asdf-module.mk 2009-04-30 12:22:56.509637395 -0500
@@ -20,6 +20,8 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME
CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC))))
endif
+EXTRA_CFLAGS += $(RPM_OPT_FLAGS)
+
export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
all: $(EXTRA_ALL_TARGETS)
diff -up sbcl-1.0.28/src/runtime/Config.ppc-linux.optflags sbcl-1.0.28/src/runtime/Config.ppc-linux
--- sbcl-1.0.28/src/runtime/Config.ppc-linux.optflags 2006-11-19 05:26:16.000000000 -0600
+++ sbcl-1.0.28/src/runtime/Config.ppc-linux 2009-04-30 12:21:36.861636752 -0500
@@ -9,7 +9,7 @@
# provided with absolutely no warranty. See the COPYING and CREDITS
# files for more information.
-CFLAGS = -g
+CFLAGS += $(RPM_OPT_FLAGS)
LINKFLAGS += -v -rdynamic
NM = ./linux-nm
diff -up sbcl-1.0.28/src/runtime/Config.sparc-linux.optflags sbcl-1.0.28/src/runtime/Config.sparc-linux
--- sbcl-1.0.28/src/runtime/Config.sparc-linux.optflags 2005-09-16 08:26:39.000000000 -0500
+++ sbcl-1.0.28/src/runtime/Config.sparc-linux 2009-04-30 12:21:36.862636949 -0500
@@ -10,6 +10,7 @@
# files for more information.
ASFLAGS = -g -Wall
+CFLAGS += $(RPM_OPT_FLAGS)
LINKFLAGS += -v -rdynamic
NM = ./linux-nm
diff -up sbcl-1.0.28/src/runtime/Config.x86_64-linux.optflags sbcl-1.0.28/src/runtime/Config.x86_64-linux
--- sbcl-1.0.28/src/runtime/Config.x86_64-linux.optflags 2006-11-13 10:03:31.000000000 -0600
+++ sbcl-1.0.28/src/runtime/Config.x86_64-linux 2009-04-30 12:21:36.863636867 -0500
@@ -34,7 +34,7 @@ ifdef LISP_FEATURE_SB_THREAD
OS_LIBS += -lpthread
endif
-CFLAGS += -fno-omit-frame-pointer
+CFLAGS += -fno-omit-frame-pointer $(RPM_OPT_FLAGS)
GC_SRC = gencgc.c
diff -up sbcl-1.0.28/src/runtime/Config.x86-linux.optflags sbcl-1.0.28/src/runtime/Config.x86-linux
--- sbcl-1.0.28/src/runtime/Config.x86-linux.optflags 2006-11-13 10:03:31.000000000 -0600
+++ sbcl-1.0.28/src/runtime/Config.x86-linux 2009-04-30 12:21:36.864637274 -0500
@@ -38,6 +38,8 @@ ifdef LISP_FEATURE_SB_THREAD
OS_LIBS += -lpthread
endif
+CFLAGS += $(RPM_OPT_FLAGS)
+
GC_SRC = gencgc.c
# Nothing to do for after-grovel-headers.
--- 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 29 Jul 2009 20:31:38 -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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/EL-5/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore 5 Nov 2008 17:18:55 -0000 1.26
+++ .cvsignore 29 Jul 2009 20:31:38 -0000 1.27
@@ -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-5/sbcl.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sbcl.spec 5 Nov 2008 17:18:55 -0000 1.63
+++ sbcl.spec 29 Jul 2009 20:31:39 -0000 1.64
@@ -8,11 +8,11 @@
%define sbcl_shell /bin/bash
# threading support
-%{?!_without_threads:%define _with_threads --with-threads}
+%{?!_without_threads:%global _with_threads --with-threads}
Name: sbcl
Summary: Steel Bank Common Lisp
-Version: 1.0.22
+Version: 1.0.30
Release: 1%{?dist}
License: BSD
@@ -22,9 +22,9 @@ 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)
@@ -81,14 +81,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.28-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
@@ -112,7 +114,7 @@ fi
#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
@@ -232,7 +234,7 @@ fi
%files
%defattr(-,root,root)
%doc BUGS COPYING README CREDITS NEWS TLA TODO
-%doc SUPPORT STYLE PRINCIPLES
+%doc STYLE PRINCIPLES
%{_bindir}/*
%{_libdir}/sbcl/
%{_mandir}/man?/*
@@ -250,6 +252,36 @@ rm -rf %{buildroot}
%changelog
+* 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-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources 5 Nov 2008 17:18:55 -0000 1.28
+++ sources 29 Jul 2009 20:31:39 -0000 1.29
@@ -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 ---
- Previous message (by thread): rpms/maxima/F-11 .cvsignore, 1.29, 1.30 maxima.spec, 1.127, 1.128 sources, 1.27, 1.28 maxima-5.9.4-gcl_setarch.patch, 1.1, NONE
- Next message (by thread): rpms/kdepimlibs/devel kdepimlibs.spec,1.94,1.95
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list