rpms/sbcl/devel sbcl-0.9.10-make-config-ppc.patch, NONE, 1.1 sbcl.spec, 1.37, 1.38 sbcl-0.9.5-make-config-fix.patch, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Mon Feb 27 14:20:53 UTC 2006


Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12791

Modified Files:
	sbcl.spec 
Added Files:
	sbcl-0.9.10-make-config-ppc.patch 
Removed Files:
	sbcl-0.9.5-make-config-fix.patch 
Log Message:
update/fix make-config patch (ppc)
cleanup bootstrapping bits


sbcl-0.9.10-make-config-ppc.patch:

--- NEW FILE sbcl-0.9.10-make-config-ppc.patch ---
--- 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


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sbcl.spec	27 Feb 2006 12:55:38 -0000	1.37
+++ sbcl.spec	27 Feb 2006 14:20:53 -0000	1.38
@@ -27,19 +27,21 @@
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
+# or
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 10 
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
-BuildRequires: sbcl
-#define sbcl_bootstrap_src -a 20 
+#BuildRequires: sbcl
+# or
+Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-64-linux-binary.tar.bz2
+%define sbcl_bootstrap_src -a 20 
 %endif
 
 ## ppc section
@@ -63,7 +65,7 @@
 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.5-make-config-fix.patch
+Patch5: sbcl-0.9.10-make-config-ppc.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
 Patch7: sbcl-0.9.9-permissive.patch
@@ -95,7 +97,7 @@
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
-%patch5 -p1 -b .make-config-fix
+%patch5 -p1 -b .make-config-ppc
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 


--- sbcl-0.9.5-make-config-fix.patch DELETED ---




More information about the scm-commits mailing list