Ticket #10766: ecl-11.1.1-update.patch

SPKG.txt

@@ -49 +49 @@
 
 == Changelog ==
 
+=== ecl-11.1.1 (François Bissey, 13th February 2011) ===
+  * #10766 Update to the latest stable release of ECL which will
+    solve some long standing problems on 64-bit solaris.
+  * Added a patch (ecls-11.1.1-cmploc.lisp.patch) cherrypicked from
+    an upstream commit. The problem caused are discussed here:
+    http://www.mail-archive.com/ecls-list@lists.sourceforge.net/msg00671.html
+    and the commit used to create the patch is here:
+    http://ecls.git.sourceforge.net/git/gitweb.cgi?p=ecls/ecl;a=commit;h=ce19c67a1b9f63cd232e7c0a621b6ca87aaa7214
+
 === ecl-10.4.1 (David Kirkby, 11th November 2010) ===
   * #10187 Update to the latest stable release of ECL, which is needed
     to build on Fedora 14 (see #10185). 

new file patches/ecls-11.1.1-cmploc.lisp.patch

@@ +1 @@
+diff --git a/src/cmp/cmploc.lsp b/src/cmp/cmploc.lsp
+index ca6a93d..87e6232 100644
+--- src/cmp/cmploc.lsp
++++ src/cmp/cmploc.lsp
+@@ -98,7 +98,7 @@
+            (and (eq (car loc) 'C-INLINE)
+                 (eq (sixth loc) 'VALUES)))))
+ 
+-(defun loc-immediate-value-p (loc &aux head)
++(defun loc-immediate-value-p (loc)
+   (cond ((eq loc t)
+          (values t t))
+         ((eq loc nil)
+@@ -112,9 +112,9 @@
+                (values t value))))
+         ((atom loc)
+          (values nil nil))
+-
+-        ((member head '(fixnum-value character-value long-float-value
+-                        double-float-value single-float-value))
++        ((member (first loc)
++                 '(fixnum-value character-value long-float-value
++                   double-float-value single-float-value))
+          (values t (second loc)))
+         (t
+          (values nil nil))))
+@@ -123,7 +123,7 @@
+   (baboon :format-control "Unknown location found in ~A~%~S"
+           :format-arguments (list where loc)))
+ 
+-(defun wt-loc (loc &aux fd)
++(defun wt-loc (loc)
+   (cond ((consp loc)
+          (let ((fd (gethash (car loc) *wt-loc-dispatch-table*)))
+            (if fd

spkg-install

@@ -6 +6 @@
    exit 1
 fi
 
+###############################################################
+# apply patch for the problem acknowledged upstream in
+# http://www.mail-archive.com/ecls-list@lists.sourceforge.net/msg00671.html
+# The patch itself comes from the following commit:
+# http://ecls.git.sourceforge.net/git/gitweb.cgi?p=ecls/ecl;a=commit;h=ce19c67a1b9f63cd232e7c0a621b6ca87aaa7214
+###############################################################
+cd src
+patch -p0 < ../patches/ecls-11.1.1-cmploc.lisp.patch
+
 if [ "x$CFLAG64" = x ] ; then
    CFLAG64=-m64
 fi
@@ -66 +75 @@
 # We clear MAKEFLAGS to fix building multiple spkgs in parallel on OS X.
 export MAKEFLAGS=
 
-cd src
-
 if [ "x`uname -sm`" = "xSunOS i86pc" ] && [ "x$SAGE64" = xyes ]  ; then
    # Need to add --with-dffi=no to disable assembly code on OpenSolaris x64. 
    # and Solaris 10 on x64.