rpms/sbcl/EL-4 sbcl-1.0.16-optflags.patch, NONE, 1.1 sbcl-1.0.19-default-sbcl-home.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 sbcl.spec, 1.48, 1.49 sources, 1.23, 1.24 sbcl-0.8.18-default-sbcl-home.patch, 1.3, NONE sbcl-1.0-optflags.patch, 1.1, NONE

Rex Dieter rdieter at fedoraproject.org
Wed Nov 5 17:32:14 UTC 2008 

Author: rdieter

Update of /cvs/pkgs/rpms/sbcl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8011

Modified Files:
	.cvsignore sbcl.spec sources 
Added Files:
	sbcl-1.0.16-optflags.patch sbcl-1.0.19-default-sbcl-home.patch 
Removed Files:
	sbcl-0.8.18-default-sbcl-home.patch sbcl-1.0-optflags.patch 
Log Message:
* Thu Oct 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.22-1
- sbcl-1.0.22


sbcl-1.0.16-optflags.patch:

--- NEW FILE sbcl-1.0.16-optflags.patch ---
diff -up sbcl-1.0.16/contrib/asdf-module.mk.optflags sbcl-1.0.16/contrib/asdf-module.mk
--- sbcl-1.0.16/contrib/asdf-module.mk.optflags	2008-04-25 09:23:25.000000000 -0500
+++ sbcl-1.0.16/contrib/asdf-module.mk	2008-04-25 09:23:35.000000000 -0500
@@ -16,6 +16,8 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME
   EXTRA_CFLAGS=-mno-cygwin
 endif
 
+EXTRA_CFLAGS += $(RPM_OPT_FLAGS)
+
 export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
 
 all: $(EXTRA_ALL_TARGETS)
diff -up sbcl-1.0.16/src/runtime/Config.ppc-linux.optflags sbcl-1.0.16/src/runtime/Config.ppc-linux
--- sbcl-1.0.16/src/runtime/Config.ppc-linux.optflags	2006-11-19 05:26:16.000000000 -0600
+++ sbcl-1.0.16/src/runtime/Config.ppc-linux	2008-04-25 09:02:38.000000000 -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.16/src/runtime/Config.sparc-linux.optflags sbcl-1.0.16/src/runtime/Config.sparc-linux
--- sbcl-1.0.16/src/runtime/Config.sparc-linux.optflags	2005-09-16 08:26:39.000000000 -0500
+++ sbcl-1.0.16/src/runtime/Config.sparc-linux	2008-04-25 09:02:38.000000000 -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.16/src/runtime/Config.x86_64-linux.optflags sbcl-1.0.16/src/runtime/Config.x86_64-linux
--- sbcl-1.0.16/src/runtime/Config.x86_64-linux.optflags	2006-11-13 10:03:31.000000000 -0600
+++ sbcl-1.0.16/src/runtime/Config.x86_64-linux	2008-04-25 09:02:38.000000000 -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.16/src/runtime/Config.x86-linux.optflags sbcl-1.0.16/src/runtime/Config.x86-linux
--- sbcl-1.0.16/src/runtime/Config.x86-linux.optflags	2006-11-13 10:03:31.000000000 -0600
+++ sbcl-1.0.16/src/runtime/Config.x86-linux	2008-04-25 09:02:38.000000000 -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.

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/EL-4/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	9 Jan 2008 04:34:06 -0000	1.21
+++ .cvsignore	5 Nov 2008 17:31:44 -0000	1.22
@@ -1,4 +1 @@
-sbcl-1.0.5-x86-64-linux-binary.tar.bz2
-sbcl-1.0.5-x86-linux-binary.tar.bz2
-sbcl-1.0.12-source.tar.bz2
-sbcl-1.0.13-source.tar.bz2
+sbcl-1.0.22-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/EL-4/sbcl.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sbcl.spec	9 Jan 2008 04:34:06 -0000	1.48
+++ sbcl.spec	5 Nov 2008 17:31:44 -0000	1.49
@@ -1,7 +1,7 @@
 
-# build only a minimal sbcl whose sole-purpose is to be bootstrap
-# for a future sbcl build
-#define min_bootstrap 1
+%if 0%{?fedora} > 9
+%define common_lisp_controller 1
+%endif
 
 # define to enable verbose build for debugging
 #define sbcl_verbose 1 
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 1.0.13
+Version: 1.0.22
 Release: 1%{?dist}
 
 License: BSD
@@ -20,14 +20,19 @@
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i386 x86_64 ppc sparc
+%if 0%{?fedora} > 8
+# reinclude ppc when fixed: http://bugzilla.redhat.com/448734 
+ExclusiveArch: i386 x86_64 sparcv9
+%else
+ExclusiveArch: i386 x86_64 ppc sparcv9
+%endif
 
 # Pre-generated html docs (not used)
-#Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
+#Source1: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-1.0.5-x86-linux-binary.tar.bz2
+#Source10: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-1.0.15-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -36,7 +41,7 @@
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-1.0.5-x86-64-linux-binary.tar.bz2
+#Source20: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-1.0.17-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
@@ -56,8 +61,8 @@
 %endif
 
 ## sparc section
-#Source40: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.17-sparc-linux-binary.tar.bz2
-%ifarch sparc 
+#Source40: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-0.9.17-sparc-linux-binary.tar.bz2
+%ifarch sparcv9
 %define sbcl_arch sparc 
 BuildRequires: sbcl
 # or
@@ -66,11 +71,20 @@
 
 Source100: my_setarch.c
 
-Patch1: sbcl-0.8.18-default-sbcl-home.patch
+%if 0%{?common_lisp_controller}
+BuildRequires: common-lisp-controller
+Requires:      common-lisp-controller
+Requires(post): common-lisp-controller
+Requires(preun): common-lisp-controller
+Source200: sbcl.sh
+Source201: sbcl.rc
+Source202: sbcl-install-clc.lisp
+%endif
+
+Patch1: sbcl-1.0.19-default-sbcl-home.patch
 Patch2: sbcl-0.9.5-personality.patch
-Patch3: sbcl-1.0-optflags.patch
+Patch3: sbcl-1.0.16-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
@@ -98,14 +112,14 @@
 
 #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
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
-%if "%{?_with_threads:1}" == "1"
+%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
@@ -115,7 +129,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
@@ -128,10 +142,8 @@
 
 %build
 
-export CFLAGS="$RPM_OPT_FLAGS"
-
 # 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
@@ -142,21 +154,17 @@
 
 # WORKAROUND sb-posix STAT.2, STAT.4 test failures (fc3/fc4 only, fc5 passes?)
 # http://bugzilla.redhat.com/169506
-touch contrib/sb-posix/test-passed
+#touch contrib/sb-posix/test-passed
 # WORKAROUND sb-bsd-sockets test failures
 # http://bugzilla.redhat.com/214568
-touch contrib/sb-bsd-sockets/test-passed
+#touch contrib/sb-bsd-sockets/test-passed
 
-# trick contrib/ modules to use optflags too 
-export EXTRA_CFLAGS="$CFLAGS"
 export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
 %{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap}
 
 # docs
-%if "%{?min_bootstrap}" == "%{nil}"
 make -C doc/manual html info
-%endif
 
 
 %check
@@ -164,55 +172,61 @@
 # santity check, essential contrib modules get built/included? 
 CONTRIBS="sb-posix sb-bsd-sockets"
 for CONTRIB in $CONTRIBS ; do
-  if [ ! -d $RPM_BUILD_ROOT%{_libdir}/sbcl/$CONTRIB ]; then
+  if [ ! -d %{buildroot}%{_libdir}/sbcl/$CONTRIB ]; then
     echo "WARNING: ${CONTRIB} awol!"
     ERROR=1 
+    echo "ulimit -a"
+    ulimit -a
   fi
 done
 pushd tests 
 # Only x86 builds are expected to pass all
 # Don't worry about thread.impure failure(s), threading is optional anyway.
-%{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
+## skip test for now, known to hang
+## %{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
 popd
 exit $ERROR
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}}
+mkdir -p %{buildroot}{%{_bindir},%{_libdir},%{_mandir}}
 
 unset SBCL_HOME 
-export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} 
-export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} 
+export INSTALL_ROOT=%{buildroot}%{_prefix} 
+export LIB_DIR=%{buildroot}%{_libdir} 
 %{?sbcl_shell} ./install.sh 
 
+%if 0%{?common_lisp_controller}
+install -m744 -p -D %{SOURCE200} %{buildroot}%{_libdir}/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
+# linking ok? -- Rex
+cp -p %{buildroot}%{_libdir}/sbcl/sbcl.core %{buildroot}%{_libdir}/sbcl/sbcl-dist.core
+%endif
+
 ## Unpackaged files
-rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
-rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
+rm -rf %{buildroot}%{_docdir}/sbcl
+rm -f  %{buildroot}%{_infodir}/dir
 # CVS crud 
-find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
-find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f
+find %{buildroot} -name CVS -type d | xargs rm -rf
+find %{buildroot} -name .cvsignore | xargs rm -f
 # 'test-passed' files from %%check
-find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -vf
+find %{buildroot} -name 'test-passed' | xargs rm -vf
 
 
-%if "%{?min_bootstrap}" == "%{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 ||:
 
-%postun
+%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
-# min_bootstrap: We *could* check for only-on-upgrade, but why bother?   (-:
-/sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir >& /dev/null ||:
-/sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir >& /dev/null ||:
-%endif
 
 
 %files
@@ -222,18 +236,67 @@
 %{_bindir}/*
 %{_libdir}/sbcl/
 %{_mandir}/man?/*
-%if "%{?min_bootstrap}" == "%{nil}"
 %doc doc/manual/sbcl
 %doc doc/manual/asdf
 %{_infodir}/*
+%if 0%{?common_lisp_controller}
+%{_libdir}/common-lisp/bin/*
+%{_sysconfdir}/*
 %endif
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.22-1
+- sbcl-1.0.22
+
+* Thu Oct 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.21-1
+- sbcl-1.0.21
+- common-lisp-controller bits f10+ only (for now)
+- drop never-used min_bootstrap crud
+
+* Mon Sep 22 2008 Anthony Green <green at redhat.com> - 1.0.20-3
+- Create missing directories.
+
+* 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
+
+* Wed Jul 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.19-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)
+
+* Wed May 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.17-2
+- omit ppc build (#448734)
+- skip tests, known to (sometimes) hang
+
+* Wed May 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.17-1
+- sbcl-1.0.17
+
+* Sat Apr 25 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.16-1
+- sbcl-1.0.16
+
+* Thu Apr 10 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.15-2
+- binutils patch
+
+* Fri Feb 29 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.15-1
+- sbcl-1.0.15
+- %%check: skip run-tests, hangs on room.test.sh
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.14-2
+- Autorebuild for GCC 4.3
+
+* Mon Jan 28 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.14-1
+- sbcl-1.0.14
+
 * Thu Dec 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.13-1
 - sbcl-1.0.13
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/EL-4/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	9 Jan 2008 04:34:06 -0000	1.23
+++ sources	5 Nov 2008 17:31:44 -0000	1.24
@@ -1 +1 @@
-e85b4dce822726b7e9304ec60bf87618  sbcl-1.0.13-source.tar.bz2
+fad4f6634aedadd3212804b65ac89c96  sbcl-1.0.22-source.tar.bz2


--- sbcl-0.8.18-default-sbcl-home.patch DELETED ---


--- sbcl-1.0-optflags.patch DELETED ---

More information about the scm-commits mailing list