rpms/maxima/FC-5 maxima-5.9.3-gcl-setarch.patch, NONE, 1.1 maxima-5.9.3-sbcl-disable-debugger.patch, NONE, 1.1 maxima.spec, 1.21, 1.22 maxima-5.9.2-sbcl-disable-debugger.patch, 1.1, NONE

Fri Apr 28 12:31:19 UTC 2006

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27630

Modified Files:
	maxima.spec 
Added Files:
	maxima-5.9.3-gcl-setarch.patch 
	maxima-5.9.3-sbcl-disable-debugger.patch 
Removed Files:
	maxima-5.9.2-sbcl-disable-debugger.patch 
Log Message:
* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
- use setarch -X hack to allow runtime-gcl to function (#187647)
- respin for sbcl-0.9.12


maxima-5.9.3-gcl-setarch.patch:

--- NEW FILE maxima-5.9.3-gcl-setarch.patch ---
--- maxima-5.9.3/src/maxima.in.setarch	2005-11-07 11:37:11.000000000 -0600
+++ maxima-5.9.3/src/maxima.in	2006-04-27 07:07:42.000000000 -0500
@@ -128,7 +128,7 @@
 	exec "@SCL_NAME@" -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
     fi
 elif [ "$MAXIMA_LISP" = "gcl" ]; then
-    exec "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    exec "setarch" "@ARCH@" "-X" "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
 elif [ "$MAXIMA_LISP" = "acl6" ]; then
 # FIXME: arguments need in a manner consistent with the way they are extracted
 #        in the function get-application-args in command-line.lisp

maxima-5.9.3-sbcl-disable-debugger.patch:

--- NEW FILE maxima-5.9.3-sbcl-disable-debugger.patch ---
--- maxima-5.9.3/src/Makefile.am.sbcl-disable-debugger	2006-02-11 08:25:06.000000000 -0600
+++ maxima-5.9.3/src/Makefile.am	2006-04-26 14:30:15.000000000 -0500
@@ -151,7 +151,7 @@
 
 
 if SBCL
-EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 all-local: binary-sbcl/maxima.core
 install-exec-local: install-sbcl
 uninstall: uninstall-sbcl
--- maxima-5.9.3/src/Makefile.in.sbcl-disable-debugger	2006-03-19 09:23:40.000000000 -0600
+++ maxima-5.9.3/src/Makefile.in	2006-04-26 14:31:14.000000000 -0500
@@ -204,7 +204,7 @@
 @CMUCL_TRUE at EXECUTECMUCL = $(CMUCL_NAME) -noinit -batch
 @SCL_TRUE at EXECUTESCL = $(SCL_NAME) -noinit -batch
 @ACL6_TRUE at EXECUTEACL6 = $(ACL6_NAME) -batch
- at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+ at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 @GCL_TRUE at EXECUTEGCL = $(GCL_NAME) -batch -eval
 @OPENMCL_TRUE at EXECUTEOPENMCL = $(OPENMCL_NAME) -e
 genericdir = $(instsrcdir)


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- maxima.spec	10 Apr 2006 17:31:33 -0000	1.21
+++ maxima.spec	28 Apr 2006 12:31:19 -0000	1.22
@@ -1,9 +1,14 @@
 
+%if "%{?fedora}" > "4"
+# See http://bugzilla.redhat.com/bugzilla/187647
+%define setarch_hack 1
+%endif
+
 Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -15,19 +20,19 @@
 #  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
-%define _with_default_lisp --with-default-lisp=clisp
-
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
 %endif
 
 %ifarch %{ix86} x86_64
+%define default_lisp clisp
 %define _enable_clisp --enable-clisp 
 %define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
 
 %ifarch ppc
+#define default_lisp sbcl
 #define _enable_clisp --enable-clisp 
 #define _enable_cmucl --enable-cmucl 
 #define _enable_gcl --enable-gcl 
@@ -46,11 +51,13 @@
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
-Patch3: maxima-5.9.2-sbcl-disable-debugger.patch
+Patch3: maxima-5.9.3-sbcl-disable-debugger.patch
 # ghostview -> evince (ps/pdf viewer)
 Patch4: maxima-5.9.2-evince.patch
 # emaxima fix from Camm Maguire
 Patch5: maxima-5.9.2-emaxima.patch
+# maxima-runtime-gcl: Unrecoverable error: fault count too high (bug #187647)
+Patch6: maxima-5.9.3-gcl-setarch.patch
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
@@ -71,6 +78,10 @@
 BuildRequires: tk
 
 Requires: %{name}-runtime = %{version}
+## Consider this when rpm supports it -- Rex
+#if "%{?default_lisp:1}" == "1"
+#Requires(hint): %{name}-runtime-%{default_lisp} = %{version}
+#endif
 Requires: gnuplot
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
@@ -134,8 +145,13 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
+%if "%{?setarch_hack}" == "1"
+BuildRequires: setarch
+Requires:  setarch
+%endif
 Obsoletes: maxima-exec-gcl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
+Provides:  %{name}-runtime-gcl = %{version}-%{release}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
 %endif
@@ -168,10 +184,16 @@
 
 %patch1 -p1 -b .htmlview
 #patch2 -p1 -b .xemacs
+%patch3 -p1 -b .sbcl-disable-debugger
 %if "%{?fedora}" > "3"
 %patch4 -p1 -b .evince
 %endif
 %patch5 -p1 -b .emaxima
+%if "%{?setarch_hack}" == "1"
+%patch6 -p1 -b .gcl-setarch
+%endif
+
+sed -i -e 's|@ARCH@|%{_target_cpu}|' src/maxima.in
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -182,15 +204,10 @@
 # remove CVS crud
 find -name CVS -type d | xargs rm -r
 
-#patch3 -p1 -b .sbcl-disable-debugger
-#aclocal
-#automake --add-missing --copy
-#autoconf
-
 
 %build
 %configure \
-  %{?_with_default_lisp} \
+  %{?default_lisp:--with-default-lisp=%{default_lisp} } \
   %{?_enable_clisp} %{!?_enable_clisp: --disable-clisp } %{?_with_clisp_runtime} \
   %{?_enable_cmucl} %{!?_enable_cmucl: --disable-cmucl } %{?_with_cmucl_runtime} \
   %{?_enable_gcl}   %{!?_enable_gcl:   --disable-gcl } \
@@ -356,6 +373,10 @@
 
 
 %changelog
+* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
+- use setarch -X hack to allow runtime-gcl to function (#187647)
+- respin for sbcl-0.9.12
+
 * Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
 - 5.9.3
 


--- maxima-5.9.2-sbcl-disable-debugger.patch DELETED ---


