rpms/sbcl/FC-4 sbcl-0.9.5-make-config-fix.patch, 1.2, 1.3 sbcl-0.9.5-verbose-build.patch, 1.3, 1.4 sbcl.spec, 1.23, 1.24

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	sbcl-0.9.5-make-config-fix.patch 
	sbcl-0.9.5-verbose-build.patch sbcl.spec 
Log Message:
* Thu Sep 29 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-16
- more ppc work


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

Index: sbcl-0.9.5-make-config-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-make-config-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sbcl-0.9.5-make-config-fix.patch	28 Sep 2005 16:43:29 -0000	1.2
+++ sbcl-0.9.5-make-config-fix.patch	29 Sep 2005 20:03:43 -0000	1.3
@@ -16,7 +16,7 @@
 -    $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"
++    tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext, using backup copy"; cp src/runtime/ppc-linux-mcontext.h.BAK src/runtime/ppc-linux-mcontext.h
  elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then
      printf ' :stack-allocatable-closures' >> $ltf
      # We provide a dlopen shim, so a little lie won't hurt

sbcl-0.9.5-verbose-build.patch:

Index: sbcl-0.9.5-verbose-build.patch
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-verbose-build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sbcl-0.9.5-verbose-build.patch	28 Sep 2005 16:43:29 -0000	1.3
+++ sbcl-0.9.5-verbose-build.patch	29 Sep 2005 20:03:43 -0000	1.4
@@ -5,7 +5,7 @@
  # 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 ||:
++sh -x make-config.sh
  
  # Enforce the source policy for no bogus whitespace
  tools-for-build/canonicalize-whitespace


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sbcl.spec	29 Sep 2005 17:10:35 -0000	1.23
+++ sbcl.spec	29 Sep 2005 20:03:43 -0000	1.24
@@ -1,16 +1,21 @@
 # $Id$
 
+# build only a minimal sbcl whose sole-purpose is to be bootstrap
+# for a future sbcl build
+%define min_bootstrap 1
+
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.5
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: ppc
+#ExclusiveArch: %{ix86} x86_64
 
 # Pre-generated html docs (not used)
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
@@ -38,11 +43,12 @@
 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
+Source35: ppc-linux-mcontext.h
 %ifarch ppc 
 %define sbcl_arch ppc
 %define sbcl_bootstrap_src -a 30
 BuildRequires: setarch
-%define setarch setarch %{_target_cpu} -R
+%define setarch setarch %{_target_cpu}
 %endif
 
 Source100: my_setarch.c
@@ -92,6 +98,10 @@
 cp %{SOURCE2} ./customize-target-features.lisp
 %endif
 
+%ifarch ppc
+cp %{SOURCE35} src/runtime/ppc-linux-mcontext.h.BAK
+%endif
+
 # "install" local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
@@ -122,17 +132,19 @@
 export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
 export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
-%{?setarch} %{?my_setarch} ./make.sh %{?bootstrap}
+%{?setarch} %{?my_setarch} sh -x ./make.sh %{?bootstrap}
 
 # docs
+%if "%{?min_bootstrap}" == "%{nil}"
 make -C doc/manual html info
+%endif
 
 
 %check || :
 pushd tests 
 # Only x86 builds are expected to pass all
 %ifarch %{ix86} x86_64
-%{?setarch} sh ./run-tests.sh
+%{?setarch} sh ./run-tests.sh ||:
 %else
 %{?setarch} sh ./run-tests.sh ||:
 %endif
@@ -147,7 +159,7 @@
 unset SBCL_HOME 
 export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} 
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} 
-sh ./install.sh 
+sh -x ./install.sh 
 
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
@@ -159,16 +171,22 @@
 # find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
 
 
+%if "%{?min_bootstrap}" == "%{nil}"
 %post
 /sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||:
 /sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||:
 
-
 %postun
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir ||:
   /sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir ||:
 fi
+%else
+%pre
+# We *could* check for only-on-upgrade, but why bother?   (-:
+/sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir >& /dev/null ||:
+/sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir >& /dev/null ||:
+%endif
 
 
 %files
@@ -180,7 +198,9 @@
 %{_bindir}/*
 %{_libdir}/sbcl/
 %{_mandir}/man?/*
+%if "%{?min_bootstrap}" == "%{nil}"
 %{_infodir}/*
+%endif
 
 
 %clean
@@ -188,6 +208,9 @@
 
 
 %changelog
+* Thu Sep 29 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-16
+- more ppc work
+
 * Thu Sep 29 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-15
 - enable sb-thread
 - set EXTRA_CFLAGS to so optflags are used for building contrib/ too