diff --git a/sbcl-0.9.10-make-config-ppc.patch b/sbcl-0.9.10-make-config-ppc.patch deleted file mode 100644 index 1f392c4..0000000 --- a/sbcl-0.9.10-make-config-ppc.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- sbcl-0.9.10/make-config.sh.make-config-ppc 2006-02-23 13:57:56.000000000 -0600 -+++ sbcl-0.9.10/make-config.sh 2006-02-27 07:00:26.000000000 -0600 -@@ -273,7 +273,7 @@ - # cross-compilers! - # - # FIXME: integrate to grovel-features, mayhaps -- $GNUMAKE -C tools-for-build determine-endianness -I src/runtime -+ $GNUMAKE -C tools-for-build determine-endianness -I ../src/runtime - tools-for-build/determine-endianness >> $ltf - elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "linux" ]; then - # Use a C program to detect which kind of glibc we're building on, -@@ -282,8 +282,8 @@ - # - # FIXME: integrate to grovel-features., maypahps - printf ' :gencgc :stack-allocatable-closures :linkage-table' >> $ltf -- $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime -- tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h -+ $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime -+ tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || (echo "error running where-is-mcontext"; exit 1) - elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then - printf ' :gencgc :stack-allocatable-closures' >> $ltf - # We provide a dlopen shim, so a little lie won't hurt diff --git a/sbcl-0.9.13-LIB_DIR.patch b/sbcl-0.9.13-LIB_DIR.patch new file mode 100644 index 0000000..22f8387 --- /dev/null +++ b/sbcl-0.9.13-LIB_DIR.patch @@ -0,0 +1,37 @@ +--- sbcl-0.9.13/install.sh.LIB_DIR 2006-05-17 07:06:08.000000000 -0500 ++++ sbcl-0.9.13/install.sh 2006-05-30 15:09:38.000000000 -0500 +@@ -23,10 +23,11 @@ + MAN_DIR=${MAN_DIR-$INSTALL_ROOT/share/man} + INFO_DIR=${INFO_DIR-$INSTALL_ROOT/share/info} + DOC_DIR=${DOC_DIR-$INSTALL_ROOT/share/doc/sbcl} ++LIB_DIR=${LIB_DIR-$INSTALL_ROOT/lib} + + # Does the environment look sane? + SBCL_SOURCE=`pwd` +-if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then ++if [ -n "$SBCL_HOME" -a "$LIB_DIR/sbcl" != "$SBCL_HOME" ];then + echo SBCL_HOME environment variable is set, and conflicts with INSTALL_ROOT. + echo Aborting installation. Unset one or reset the other, then try again + echo INSTALL_ROOT="$INSTALL_ROOT" +@@ -47,10 +48,10 @@ + exit 1 + fi + +-SBCL_HOME=$INSTALL_ROOT/lib/sbcl ++SBCL_HOME=$LIB_DIR/sbcl + export SBCL_HOME INSTALL_ROOT + ensure_dirs $BUILD_ROOT$INSTALL_ROOT $BUILD_ROOT$INSTALL_ROOT/bin \ +- $BUILD_ROOT$INSTALL_ROOT/lib \ ++ $BUILD_ROOT$LIB_DIR \ + $BUILD_ROOT$MAN_DIR $BUILD_ROOT$MAN_DIR/man1 \ + $BUILD_ROOT$INFO_DIR $BUILD_ROOT$DOC_DIR \ + $BUILD_ROOT$DOC_DIR/html \ +@@ -87,7 +88,7 @@ + echo + echo "SBCL has been installed:" + echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/$RUNTIME" +-echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/" ++echo " core and contribs in $BUILD_ROOT$LIB_DIR/sbcl" + + # Installing manual & misc bits of documentation + # diff --git a/sbcl-0.9.4-LIB_DIR.patch b/sbcl-0.9.4-LIB_DIR.patch deleted file mode 100644 index a4a2785..0000000 --- a/sbcl-0.9.4-LIB_DIR.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- sbcl-0.9.4/install.sh.lib64 2005-05-28 04:00:34.000000000 -0500 -+++ sbcl-0.9.4/install.sh 2005-09-12 14:00:27.310267719 -0500 -@@ -13,10 +13,11 @@ - MAN_DIR=${MAN_DIR-$INSTALL_ROOT/share/man} - INFO_DIR=${INFO_DIR-$INSTALL_ROOT/share/info} - DOC_DIR=${DOC_DIR-$INSTALL_ROOT/share/doc/sbcl} -+LIB_DIR=${LIB_DIR-$INSTALL_ROOT/lib} - - # Does the environment look sane? - SBCL_SOURCE=`pwd` --if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then -+if [ -n "$SBCL_HOME" -a "$LIB_DIR/sbcl" != "$SBCL_HOME" ];then - echo SBCL_HOME environment variable is set, and conflicts with INSTALL_ROOT. - echo Aborting installation. Unset one or reset the other, then try again - echo INSTALL_ROOT="$INSTALL_ROOT" -@@ -37,10 +38,10 @@ - exit 1 - fi - --SBCL_HOME=$INSTALL_ROOT/lib/sbcl -+SBCL_HOME=$LIB_DIR/sbcl - export SBCL_HOME INSTALL_ROOT - ensure_dirs $BUILD_ROOT$INSTALL_ROOT $BUILD_ROOT$INSTALL_ROOT/bin \ -- $BUILD_ROOT$INSTALL_ROOT/lib \ -+ $BUILD_ROOT$LIB_DIR \ - $BUILD_ROOT$MAN_DIR $BUILD_ROOT$MAN_DIR/man1 \ - $BUILD_ROOT$INFO_DIR $BUILD_ROOT$DOC_DIR \ - $BUILD_ROOT$DOC_DIR/html \ -@@ -76,7 +77,7 @@ - echo - echo "SBCL has been installed:" - echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/sbcl" --echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/" -+echo " core and contribs in $BUILD_ROOT$LIB_DIR/sbcl" - - # Installing manual & misc bits of documentation - # diff --git a/sbcl.spec b/sbcl.spec index 34afc69..af63f93 100644 --- a/sbcl.spec +++ b/sbcl.spec @@ -9,8 +9,8 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.12 -Release: 2%{?dist} +Version: 0.9.13 +Release: 1%{?dist} License: BSD/MIT Group: Development/Languages @@ -56,8 +56,8 @@ Source100: my_setarch.c Patch1: sbcl-0.8.18-default-sbcl-home.patch Patch2: sbcl-0.9.5-personality.patch Patch3: sbcl-0.9.5-optflags.patch -Patch4: sbcl-0.9.4-LIB_DIR.patch -#Patch5: sbcl-0.9.10-make-config-ppc.patch +Patch4: sbcl-0.9.13-LIB_DIR.patch + Patch6: sbcl-0.9.5-verbose-build.patch # Allow override of contrib test failure(s) Patch7: sbcl-0.9.9-permissive.patch @@ -216,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 30 2006 Rex Dieter 0.9.13-1 +- 0.9.13 + * Mon Apr 26 2006 Rex Dieter 0.9.12-2 - respin, using new ppc bootstrap