rpms/sbcl/FC-4 customize-target-features.lisp, NONE, 1.1 sbcl-0.9.5-make-config-fix.patch, NONE, 1.1 sbcl.spec, 1.17, 1.18

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	sbcl.spec 
Added Files:
	customize-target-features.lisp 
	sbcl-0.9.5-make-config-fix.patch 
Log Message:
customize-target-features.lisp (for :sb-thread)
make-config.sh patch to properly find Config



--- NEW FILE customize-target-features.lisp ---
(lambda (features)
  (flet ((enable (x)
           (pushnew x features))
         (disable (x)
           (setf features (remove x features))))
    ;; Threading support, available on x86/x86-64 Linux only.
    (enable :sb-thread))) 

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

--- NEW FILE sbcl-0.9.5-make-config-fix.patch ---
--- sbcl-0.9.5/make-config.sh.fix	2005-09-21 10:00:33.000000000 -0500
+++ sbcl-0.9.5/make-config.sh	2005-09-28 09:00:48.000000000 -0500
@@ -208,7 +208,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,
@@ -217,7 +217,7 @@
     #
     # FIXME: integrate to grovel-features., maypahps
     printf ' :stack-allocatable-closures' >> $ltf
-    $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime
+    $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime
     tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h
 elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then
     printf ' :stack-allocatable-closures' >> $ltf


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sbcl.spec	28 Sep 2005 13:01:58 -0000	1.17
+++ sbcl.spec	28 Sep 2005 14:16:48 -0000	1.18
@@ -3,7 +3,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.5
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -13,6 +13,8 @@
 #ExclusiveArch: %{ix86} x86_64
 ExclusiveArch: ppc
 
+Source1: customize-target-features.lisp 
+
 ## x86 section
 #Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
@@ -48,6 +50,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
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -70,17 +73,12 @@
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
+%patch5 -p1 -b .make-config-fix
 
-# http://article.gmane.org/gmane.lisp.steel-bank.general/340
-# enable threads (was only for >= 2.6, but code has checks to disable for <= 2.4)
-## FIXME(?): per section 2.2 of INSTALL, should create/use customize-target-features.lisp
-## to customize features -- Rex
-#define kernel_ver %(uname -r | cut -d- -f1 | cut -d. -f-2 )
-#if "%{?kernel_ver}" >= "2.6"
 %ifarch %{ix86} x86_64
 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
+#cp %{SOURCE1} ./customize-target-features.lisp
 %endif
-#endif
 
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
@@ -166,7 +164,7 @@
 
 
 %changelog
-* Wed Sep 28 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-9
+* Wed Sep 28 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-10
 - more ppc work
 
 * Tue Sep 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-8