diff options
| -rw-r--r-- | dev-lisp/ecls/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-lisp/ecls/ecls-11.1.1-r1.ebuild (renamed from dev-lisp/ecls/ecls-11.1.1.ebuild) | 5 | ||||
| -rw-r--r-- | dev-lisp/ecls/files/11.1.1-cmploc.patch | 35 |
3 files changed, 47 insertions, 2 deletions
diff --git a/dev-lisp/ecls/ChangeLog b/dev-lisp/ecls/ChangeLog index c9fbc16f1be9..1f696224185e 100644 --- a/dev-lisp/ecls/ChangeLog +++ b/dev-lisp/ecls/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lisp/ecls # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ChangeLog,v 1.38 2011/01/17 15:53:31 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ChangeLog,v 1.39 2011/03/04 20:55:03 grozin Exp $ + +*ecls-11.1.1-r1 (04 Mar 2011) + + 04 Mar 2011; Andrey Grozin <grozin@gentoo.org> +files/11.1.1-cmploc.patch, + -ecls-11.1.1.ebuild, +ecls-11.1.1-r1.ebuild: + Fixed #357315, thanks to Francois Bissey <fbissey@slingshot.co.nz> for + cherry-pick the patches *ecls-11.1.1 (17 Jan 2011) diff --git a/dev-lisp/ecls/ecls-11.1.1.ebuild b/dev-lisp/ecls/ecls-11.1.1-r1.ebuild index fe78469addb8..4be4d07e6606 100644 --- a/dev-lisp/ecls/ecls-11.1.1.ebuild +++ b/dev-lisp/ecls/ecls-11.1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-11.1.1.ebuild,v 1.1 2011/01/17 15:53:31 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-11.1.1-r1.ebuild,v 1.1 2011/03/04 20:55:03 grozin Exp $ EAPI=3 inherit eutils multilib @@ -34,6 +34,9 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PV}-headers-gentoo.patch + + # bug #357315 + epatch "${FILESDIR}"/${PV}-cmploc.patch } src_configure() { diff --git a/dev-lisp/ecls/files/11.1.1-cmploc.patch b/dev-lisp/ecls/files/11.1.1-cmploc.patch new file mode 100644 index 000000000000..0f15bc6e14e2 --- /dev/null +++ b/dev-lisp/ecls/files/11.1.1-cmploc.patch @@ -0,0 +1,35 @@ +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 |