rpms/sbcl/F-10 sbcl-1.0.25-default_sbcl_home.patch, NONE, 1.1 sbcl-1.0.28-optflags.patch, NONE, 1.1 .cvsignore, 1.42, 1.43 sbcl.spec, 1.99, 1.100 sources, 1.43, 1.44 sbcl-1.0.16-optflags.patch, 1.1, NONE sbcl-1.0.19-default-sbcl-home.patch, 1.1, NONE

Wed Jul 29 19:38:25 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/sbcl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30199

Modified Files:
	.cvsignore sbcl.spec sources 
Added Files:
	sbcl-1.0.25-default_sbcl_home.patch sbcl-1.0.28-optflags.patch 
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.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/F-10/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	5 Nov 2008 16:37:25 -0000	1.42
+++ .cvsignore	29 Jul 2009 19:38:25 -0000	1.43
@@ -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/F-10/sbcl.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- sbcl.spec	5 Nov 2008 16:37:25 -0000	1.99
+++ sbcl.spec	29 Jul 2009 19:38:25 -0000	1.100
@@ -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/F-10/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	5 Nov 2008 16:37:25 -0000	1.43
+++ sources	29 Jul 2009 19:38:25 -0000	1.44
@@ -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 ---


