rpms/sbcl/EL-4 sbcl-0.8.18-default-sbcl-home.patch, 1.2, 1.3 sbcl-0.9.5-personality.patch, 1.2, 1.3 sbcl-0.9.5-verbose-build.patch, 1.3, 1.4 sbcl-0.9.9-permissive.patch, 1.2, 1.3

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Mon Dec 18 17:09:46 UTC 2006


Author: rdieter

Update of /cvs/extras/rpms/sbcl/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20115

Added Files:
	sbcl-0.8.18-default-sbcl-home.patch 
	sbcl-0.9.5-personality.patch sbcl-0.9.5-verbose-build.patch 
	sbcl-0.9.9-permissive.patch 
Log Message:
add back inadvertantly dropped patches


sbcl-0.8.18-default-sbcl-home.patch:

Index: sbcl-0.8.18-default-sbcl-home.patch
===================================================================
RCS file: sbcl-0.8.18-default-sbcl-home.patch
diff -N sbcl-0.8.18-default-sbcl-home.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sbcl-0.8.18-default-sbcl-home.patch	18 Dec 2006 17:09:16 -0000	1.3
@@ -0,0 +1,55 @@
+Index: make-target-1.sh
+===================================================================
+RCS file: /cvsroot/sbcl/sbcl/make-target-1.sh,v
+retrieving revision 1.12
+diff -u -r1.12 make-target-1.sh
+--- make-target-1.sh	10 Sep 2004 15:36:17 -0000	1.12
++++ make-target-1.sh	3 Jan 2005 06:44:55 -0000
+@@ -15,6 +15,29 @@
+ 
+ echo //entering make-target-1.sh
+ 
++# 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: src/runtime/runtime.c
+===================================================================
+RCS file: /cvsroot/sbcl/sbcl/src/runtime/runtime.c,v
+retrieving revision 1.43
+diff -u -r1.43 runtime.c
+--- src/runtime/runtime.c	29 Oct 2004 09:00:39 -0000	1.43
++++ src/runtime/runtime.c	3 Jan 2005 06:47:51 -0000
+@@ -61,9 +61,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) */

sbcl-0.9.5-personality.patch:

Index: sbcl-0.9.5-personality.patch
===================================================================
RCS file: sbcl-0.9.5-personality.patch
diff -N sbcl-0.9.5-personality.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sbcl-0.9.5-personality.patch	18 Dec 2006 17:09:16 -0000	1.3
@@ -0,0 +1,13 @@
+--- sbcl-0.9.5/src/runtime/linux-os.c.pers	2005-09-24 09:29:54.000000000 -0500
++++ sbcl-0.9.5/src/runtime/linux-os.c	2005-09-27 09:37:33.463478519 -0500
+@@ -177,6 +177,10 @@
+                 if (i != -1) {
+                     runtime[i] = '\0';
+                     execve(runtime, argv, envp);
++                } else {
++                    /* if /proc isn't available (like in chroot builds, like mock), 
++                     * try using execvp with argv[0] instead */
++                    execvp(argv[0], argv);
+                 }
+             }
+             /* Either changing the personality or execve() failed. Either

sbcl-0.9.5-verbose-build.patch:

Index: sbcl-0.9.5-verbose-build.patch
===================================================================
RCS file: sbcl-0.9.5-verbose-build.patch
diff -N sbcl-0.9.5-verbose-build.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sbcl-0.9.5-verbose-build.patch	18 Dec 2006 17:09:16 -0000	1.4
@@ -0,0 +1,28 @@
+--- sbcl-0.9.5/make.sh.verbose-build	2005-09-21 10:00:33.000000000 -0500
++++ sbcl-0.9.5/make.sh	2005-09-28 11:42:06.353251776 -0500
+@@ -70,7 +70,7 @@
+ # If you're cross-compiling, you should probably just walk through the
+ # make-config.sh script by hand doing the right thing on both the host
+ # and target machines.
+-sh make-config.sh
++sh -x make-config.sh
+ 
+ # Enforce the source policy for no bogus whitespace
+ tools-for-build/canonicalize-whitespace
+@@ -102,11 +102,11 @@
+ # Or, if you can set up the files somewhere shared (with NFS, AFS, or
+ # whatever) between the host machine and the target machine, the basic
+ # procedure above should still work, but you can skip the "copy" steps.
+-time sh make-host-1.sh
+-time sh make-target-1.sh
+-time sh make-host-2.sh
+-time sh make-target-2.sh
+-time sh make-target-contrib.sh
++time sh -x make-host-1.sh
++time sh -x make-target-1.sh
++time sh -x make-host-2.sh
++time sh -x make-target-2.sh
++time sh -x make-target-contrib.sh
+ 
+ NCONTRIBS=`find contrib -name Makefile -print | wc -l`
+ NPASSED=`find contrib -name test-passed -print | wc -l`

sbcl-0.9.9-permissive.patch:

Index: sbcl-0.9.9-permissive.patch
===================================================================
RCS file: sbcl-0.9.9-permissive.patch
diff -N sbcl-0.9.9-permissive.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sbcl-0.9.9-permissive.patch	18 Dec 2006 17:09:16 -0000	1.3
@@ -0,0 +1,11 @@
+--- sbcl-0.9.9/make-target-contrib.sh.permissive	2006-01-24 11:14:48.000000000 -0600
++++ sbcl-0.9.9/make-target-contrib.sh	2006-01-26 13:45:41.000000000 -0600
+@@ -51,7 +51,7 @@
+ for i in contrib/*; do
+     test -d $i && test -f $i/Makefile || continue;
+     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
+-    test -f $i/test-passed && rm $i/test-passed
++    # test -f $i/test-passed && rm $i/test-passed
+     $GNUMAKE -C $i test && touch $i/test-passed
+ done
+ 




More information about the fedora-extras-commits mailing list