rpms/sbcl/FC-3 sbcl-0.9.5-optflags.patch, NONE, 1.1 sbcl-0.9.5-personality.patch, NONE, 1.1 sbcl.spec, 1.14, 1.15 sbcl-0.9.4-optflags.patch, 1.1, NONE sbcl-0.9.4-personality.patch, 1.1, NONE

Tue Sep 27 20:44:51 UTC 2005

Author: rdieter

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

Modified Files:
	sbcl.spec 
Added Files:
	sbcl-0.9.5-optflags.patch sbcl-0.9.5-personality.patch 
Removed Files:
	sbcl-0.9.4-optflags.patch sbcl-0.9.4-personality.patch 
Log Message:
* Tue Sep 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-7
- drop ppc
- cleaner optflags patch

* Tue Sep 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-5
- set/use SBCL_ARCH/setarch (esp on ppc)
- allow arch-specific build-options

* Tue Sep 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-2
- 0.9.5
- use native sbcl bootstraps, when available (ie, %%{ix86},x86_64)
- try ppc again


sbcl-0.9.5-optflags.patch:

--- NEW FILE sbcl-0.9.5-optflags.patch ---
--- sbcl-0.9.5/src/runtime/Config.ppc-linux.optflags	2005-09-21 10:01:15.000000000 -0500
+++ sbcl-0.9.5/src/runtime/Config.ppc-linux	2005-09-27 15:03:06.295658344 -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
 
--- sbcl-0.9.5/src/runtime/Config.x86_64-linux.optflags	2005-09-21 10:01:15.000000000 -0500
+++ sbcl-0.9.5/src/runtime/Config.x86_64-linux	2005-09-27 15:04:31.690676328 -0500
@@ -34,7 +34,7 @@
                       > /dev/null 2>&1; \
                    then echo "-lpthread"; fi)
 
-CFLAGS += -fno-omit-frame-pointer
+CFLAGS += -fno-omit-frame-pointer $(RPM_OPT_FLAGS)
 
 GC_SRC = gencgc.c
 
--- sbcl-0.9.5/src/runtime/Config.x86-linux.optflags	2005-09-21 10:01:15.000000000 -0500
+++ sbcl-0.9.5/src/runtime/Config.x86-linux	2005-09-27 15:05:03.562831024 -0500
@@ -34,6 +34,8 @@
                       > /dev/null 2>&1; \
                    then echo "-lpthread"; fi)
 
+CFLAGS += $(RPM_OPT_FLAGS)
+
 GC_SRC = gencgc.c
 
 # Nothing to do for after-grovel-headers.

sbcl-0.9.5-personality.patch:

--- NEW FILE sbcl-0.9.5-personality.patch ---
--- 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


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sbcl.spec	22 Sep 2005 14:10:52 -0000	1.14
+++ sbcl.spec	27 Sep 2005 20:44:49 -0000	1.15
@@ -1,16 +1,9 @@
 # $Id$
 
-## Default to using a local bootstrap, 
-## define one of the following to override 
-## (non sbcl bootstraps untested)
-#define sbcl_bootstrap sbcl
-#define sbcl_bootstrap cmucl
-#define sbcl_bootstrap clisp
-
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.4
-Release: 19%{?dist}
+Version: 0.9.5
+Release: 7%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -19,32 +12,42 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: %{ix86} x86_64
 
-%if "%{?sbcl_bootstrap}" == "%{nil}"
-# local Bootstrap binaries
-Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-linux-binary.tar.bz2
+## x86 section
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
-%define sbcl_bootstrap_src -a 10 
+%define sbcl_arch x86
+BuildRequires: sbcl
+#define sbcl_bootstrap_src -a 10 
 %endif
-Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2
+
+## x86_64 section
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
-%define sbcl_bootstrap_src -a 11 
+%define sbcl_arch x86-64
+BuildRequires: sbcl
+#define sbcl_bootstrap_src -a 20 
 %endif
-# Latest powerpc-linux bootstrap (untested)
-Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+
+## ppc section
+# Latest powerpc-linux bootstrap, busted:
+# buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 %ifarch ppc 
-%define sbcl_bootstrap_src -a 12
-%endif
+%define sbcl_arch ppc
+%define sbcl_bootstrap_src -a 30
+BuildRequires: setarch
+%define setarch setarch %{_target_cpu}
 %endif
 
 Source100: my_setarch.c
 
 Patch1: sbcl-0.8.18-default-sbcl-home.patch
-Patch2: sbcl-0.9.4-personality.patch
-Patch3: sbcl-0.9.4-optflags.patch
+Patch2: sbcl-0.9.5-personality.patch
+Patch3: sbcl-0.9.5-optflags.patch
 Patch4: sbcl-0.9.4-LIB_DIR.patch
 
-%{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}}
-
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 # doc generation
@@ -78,7 +81,7 @@
 %endif
 #endif
 
-%if "%{?sbcl_bootstrap}" == "%{nil}"
+%if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
 pushd sbcl-*-linux
 chmod +x install.sh
@@ -96,15 +99,16 @@
 %build
 export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 
-%if "%{?sbcl_bootstrap}" == "%{nil}"
+%if "%{?sbcl_bootstrap_src}" != "%{nil}"
 export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
 export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
 
 %{__cc} -o my_setarch %{optflags} %{SOURCE100} 
-%define setarch ./my_setarch
+%define my_setarch ./my_setarch
 %endif
 
-%{?setarch} ./make.sh %{?bootstrap}
+%{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
+%{?setarch} %{?my_setarch} ./make.sh %{?bootstrap}
 
 # docs
 make -C doc/manual html info
@@ -112,7 +116,7 @@
 
 %check || :
 pushd tests 
-sh ./run-tests.sh
+%{?setarch} sh ./run-tests.sh
 popd
 
 
@@ -161,6 +165,19 @@
 
 
 %changelog
+* Tue Sep 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-7
+- drop ppc
+- cleaner optflags patch
+
+* Tue Sep 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-5
+- set/use SBCL_ARCH/setarch (esp on ppc)
+- allow arch-specific build-options
+
+* Tue Sep 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-2
+- 0.9.5
+- use native sbcl bootstraps, when available (ie, %%{ix86},x86_64)
+- try ppc again
+
 * Thu Sep 22 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.4-19
 - drop use of setarch, use my_setarch.c
 


--- sbcl-0.9.4-optflags.patch DELETED ---


--- sbcl-0.9.4-personality.patch DELETED ---


