# HG changeset patch
# User Francois Bissey <francois.bissey@canterbury.ac.nz>
# Date 1297582707 -46800
# Node ID 517b382f7a24c37539e1ab5469d24af23052a36d
# Parent bdf4cdcee02520af8ef1feeeb99bc88763b35203
trac #10766 update to ecl-11.1.1 with an additional upstream patch.
diff -r bdf4cdcee025 -r 517b382f7a24 SPKG.txt
a
|
b
|
|
49 | 49 | |
50 | 50 | == Changelog == |
51 | 51 | |
| 52 | === ecl-11.1.1 (François Bissey, 13th February 2011) === |
| 53 | * #10766 Update to the latest stable release of ECL which will |
| 54 | solve some long standing problems on 64-bit solaris. |
| 55 | * Added a patch (ecls-11.1.1-cmploc.lisp.patch) cherrypicked from |
| 56 | an upstream commit. The problem caused are discussed here: |
| 57 | http://www.mail-archive.com/ecls-list@lists.sourceforge.net/msg00671.html |
| 58 | and the commit used to create the patch is here: |
| 59 | http://ecls.git.sourceforge.net/git/gitweb.cgi?p=ecls/ecl;a=commit;h=ce19c67a1b9f63cd232e7c0a621b6ca87aaa7214 |
| 60 | |
52 | 61 | === ecl-10.4.1 (David Kirkby, 11th November 2010) === |
53 | 62 | * #10187 Update to the latest stable release of ECL, which is needed |
54 | 63 | to build on Fedora 14 (see #10185). |
diff -r bdf4cdcee025 -r 517b382f7a24 patches/ecls-11.1.1-cmploc.lisp.patch
-
|
+
|
|
| 1 | diff --git a/src/cmp/cmploc.lsp b/src/cmp/cmploc.lsp |
| 2 | index ca6a93d..87e6232 100644 |
| 3 | --- src/cmp/cmploc.lsp |
| 4 | +++ src/cmp/cmploc.lsp |
| 5 | @@ -98,7 +98,7 @@ |
| 6 | (and (eq (car loc) 'C-INLINE) |
| 7 | (eq (sixth loc) 'VALUES))))) |
| 8 | |
| 9 | -(defun loc-immediate-value-p (loc &aux head) |
| 10 | +(defun loc-immediate-value-p (loc) |
| 11 | (cond ((eq loc t) |
| 12 | (values t t)) |
| 13 | ((eq loc nil) |
| 14 | @@ -112,9 +112,9 @@ |
| 15 | (values t value)))) |
| 16 | ((atom loc) |
| 17 | (values nil nil)) |
| 18 | - |
| 19 | - ((member head '(fixnum-value character-value long-float-value |
| 20 | - double-float-value single-float-value)) |
| 21 | + ((member (first loc) |
| 22 | + '(fixnum-value character-value long-float-value |
| 23 | + double-float-value single-float-value)) |
| 24 | (values t (second loc))) |
| 25 | (t |
| 26 | (values nil nil)))) |
| 27 | @@ -123,7 +123,7 @@ |
| 28 | (baboon :format-control "Unknown location found in ~A~%~S" |
| 29 | :format-arguments (list where loc))) |
| 30 | |
| 31 | -(defun wt-loc (loc &aux fd) |
| 32 | +(defun wt-loc (loc) |
| 33 | (cond ((consp loc) |
| 34 | (let ((fd (gethash (car loc) *wt-loc-dispatch-table*))) |
| 35 | (if fd |
diff -r bdf4cdcee025 -r 517b382f7a24 spkg-install
a
|
b
|
|
6 | 6 | exit 1 |
7 | 7 | fi |
8 | 8 | |
| 9 | ############################################################### |
| 10 | # apply patch for the problem acknowledged upstream in |
| 11 | # http://www.mail-archive.com/ecls-list@lists.sourceforge.net/msg00671.html |
| 12 | # The patch itself comes from the following commit: |
| 13 | # http://ecls.git.sourceforge.net/git/gitweb.cgi?p=ecls/ecl;a=commit;h=ce19c67a1b9f63cd232e7c0a621b6ca87aaa7214 |
| 14 | ############################################################### |
| 15 | cd src |
| 16 | patch -p0 < ../patches/ecls-11.1.1-cmploc.lisp.patch |
| 17 | |
9 | 18 | if [ "x$CFLAG64" = x ] ; then |
10 | 19 | CFLAG64=-m64 |
11 | 20 | fi |
… |
… |
|
66 | 75 | # We clear MAKEFLAGS to fix building multiple spkgs in parallel on OS X. |
67 | 76 | export MAKEFLAGS= |
68 | 77 | |
69 | | cd src |
70 | | |
71 | 78 | if [ "x`uname -sm`" = "xSunOS i86pc" ] && [ "x$SAGE64" = xyes ] ; then |
72 | 79 | # Need to add --with-dffi=no to disable assembly code on OpenSolaris x64. |
73 | 80 | # and Solaris 10 on x64. |