summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-mathematics/maxima/ChangeLog7
-rw-r--r--sci-mathematics/maxima/Manifest5
-rw-r--r--sci-mathematics/maxima/files/maxima-ecl-ldflags.patch27
-rw-r--r--sci-mathematics/maxima/maxima-5.25.0.ebuild5
4 files changed, 40 insertions, 4 deletions
diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index e4e6ccb35615..8e10eb9c2af7 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-mathematics/maxima
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.90 2011/08/04 10:33:07 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.91 2011/08/27 05:03:22 grozin Exp $
+
+ 27 Aug 2011; Andrey Grozin <grozin@gentoo.org> maxima-5.25.0.ebuild,
+ +files/maxima-ecl-ldflags.patch:
+ Fixed LDFLAGS handling in ecl (bug #378195), thanks to jez austin
+ <jezaustin@gmail.com>
*maxima-5.25.0 (04 Aug 2011)
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index bcf5b9fd666c..0ae0662cf2b9 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -6,6 +6,7 @@ AUX maxima-5.24.0-wish.patch 946 RMD160 d19db10a629a9a9f1fa0799b0be403c8aee090fe
AUX maxima-5.24.0.patch 3263 RMD160 a3fb37685b9481ed1c17a53f027429656371c586 SHA1 774178e2e3cd265d3f0474b0c38fa1230c583619 SHA256 dd7d02c0eaac5a0763363ed46c207bfb40e55b8470dc3b7c2892753b466a2ea0
AUX maxima-5.25.0-wish.patch 946 RMD160 d19db10a629a9a9f1fa0799b0be403c8aee090fe SHA1 56f2ad96baed63b27d7c37cfccaf27806a06f20e SHA256 dd535626d5d2d16f249e2c41157f5bbfb030236651d9b0404cc1a69c5fec9e0c
AUX maxima-5.25.0.patch 3263 RMD160 a3fb37685b9481ed1c17a53f027429656371c586 SHA1 774178e2e3cd265d3f0474b0c38fa1230c583619 SHA256 dd7d02c0eaac5a0763363ed46c207bfb40e55b8470dc3b7c2892753b466a2ea0
+AUX maxima-ecl-ldflags.patch 1069 RMD160 96b7fec44be8919f6cac44e50e39cae9eb3c0c88 SHA1 719ea4f9f5a8e9384da01882cd0baacd9573c479 SHA256 e4a12120d30389690d2d5c1ac8ae77713e1818950632c2953ac6ec57a9c11976
AUX maxima-imaxima.patch 211 RMD160 24e2b10e59ee1fd5f9307dc8e336fa32beeb6de3 SHA1 f77dceec2dcb4503d1ec86cff7ef4d7d65a0c20f SHA256 b1d07af716f477dedfb011cb8c4fdf154d146db5172664865efc1ec025bfa2ce
AUX maxima-no-init-files.patch 2626 RMD160 ffc34cc7e1d6ade44b100252233e83aa7e383744 SHA1 97497929054fcf6924ac56006c9c4ad28c7b443d SHA256 58b82fa1cdcc2eafc0f912541b350ae7aec8c492be5f6b0ce2174ae01f399d88
AUX maxima-rmaxima.patch 481 RMD160 b81cf0f5878a1bcb9c12682db8949c2ac8105022 SHA1 a20356e335950d62ba77da4fd4053f43ffef2ecf SHA256 e918a1e2aa01f44518829013b0b6bafb276f7752503bfe43f21dcefadca1f3d6
@@ -17,6 +18,6 @@ DIST maxima-5.25.0.tar.gz 25804472 RMD160 9d9c72f6f8968bcef0059916c010d259922626
EBUILD maxima-5.18.1.ebuild 4193 RMD160 b439ed7bb29d010d1ad47f36cc91ab4ec7bf1549 SHA1 b905950feecb341b48b2859265425144286615a3 SHA256 67c46bc80625f5453d27646cabece84ad1087c8c9507ba880ae1080bf729aca2
EBUILD maxima-5.23.2.ebuild 4468 RMD160 17cec6829f97c8956181e4fc847c78a3a92cc9f3 SHA1 e389e233abbc407797a602414ccedfa4a2733725 SHA256 0092fd577c3bde28fa54b4a4a63e29db0a87a2cee7a2d324c75d14750a8f5837
EBUILD maxima-5.24.0-r1.ebuild 4920 RMD160 39f5f3e8ba475dce6de226d45053c22daecff52c SHA1 b94e0189394389d6ce56e41a6d9a8ff7e240c875 SHA256 7c6f312e44ae7be350ff82a8854716e772a8c9b1340965396d1fd7567f9ee4ae
-EBUILD maxima-5.25.0.ebuild 4955 RMD160 b3af0128f408f66733ce385d975b18d51ddf3002 SHA1 79ec7ff2d8b32a493aa1fdfa3371cd5269b16a2e SHA256 2c3daacbe35fea638ae79f6594aa754b789511a2b17fa6e5460ed69f1b3277a6
-MISC ChangeLog 20609 RMD160 5f9ba445a85b08b49b27e361bfb0ea7fb9f6b125 SHA1 2e0c4be0b7f770b71ded8fe7462e913c1cc228e7 SHA256 a35429a6bce8679e3ac30d8890088cc7018b4a73f4363ca85a8531f5e189902c
+EBUILD maxima-5.25.0.ebuild 5043 RMD160 ba3dd67f056a38aee0a872e8bc06e4e574516128 SHA1 b0b149b350960d82e92c238d7eb4b258492981e2 SHA256 4b1b91415f2de87d426b6c8736badac789d8ff277281cfb1c9b0a69320e98d46
+MISC ChangeLog 20808 RMD160 32711123078ad988a86a6a6ec4d93a4bc1f1ece0 SHA1 28b7ff4d61b480bcd6c8922c89d56b01c0e5c5cd SHA256 3cbac2bdec7c51a685084e7488d5fc0cdec54c5a513f8256a08271e194e9afc1
MISC metadata.xml 1538 RMD160 d8fdc903bc508232d729789ccfb5068b82bebc12 SHA1 1e54225d047c1e0b45df832e37fe5342a8eee70a SHA256 282f77d990621305ef1c88510b0c2a26dfd39806207179e59bab2bdae06eed5c
diff --git a/sci-mathematics/maxima/files/maxima-ecl-ldflags.patch b/sci-mathematics/maxima/files/maxima-ecl-ldflags.patch
new file mode 100644
index 000000000000..e71486fcf736
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-ecl-ldflags.patch
@@ -0,0 +1,27 @@
+diff -p -up maxima-5.20.1/src/maxima.system.orig maxima-5.20.1/src/maxima.system
+--- maxima-5.20.1/src/maxima.system.orig 2010-03-04 17:25:38.708483072 -0300
++++ maxima-5.20.1/src/maxima.system 2010-03-04 17:27:27.150481620 -0300
+@@ -44,6 +44,14 @@
+ (c:build-fasl output :lisp-files (list object-output)))))
+
+ #+ecl
++(defun split-ld-flags-for-ecl (string &aux space)
++ (setf string (string-trim '(#\Space) string))
++ (if (setf space (position #\Space string))
++ (cons (subseq string 0 space)
++ (split-ld-flags-for-ecl (subseq string (1+ space))))
++ (cons string nil)))
++
++#+ecl
+ (defun build-maxima-lib ()
+ (labels ((list-all-objects (module)
+ (if (eql (mk::component-type module) :file)
+@@ -66,7 +74,7 @@
+ :ld-flags
+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
+ (find-package "MAXIMA")))))
+- (if (and x (not (string= x ""))) (list x)))
++ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x)))
+ :epilogue-code '(progn (require :defsystem)
+ (cl-user::run)))))))
+
diff --git a/sci-mathematics/maxima/maxima-5.25.0.ebuild b/sci-mathematics/maxima/maxima-5.25.0.ebuild
index dfb5818ee647..a5f64db682d0 100644
--- a/sci-mathematics/maxima/maxima-5.25.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.25.0.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/sci-mathematics/maxima/maxima-5.25.0.ebuild,v 1.1 2011/08/04 10:33:07 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.25.0.ebuild,v 1.2 2011/08/27 05:03:22 grozin Exp $
EAPI=3
@@ -114,6 +114,9 @@ src_prepare() {
# remove rmaxima if not needed
epatch "${FILESDIR}"/${PN}-rmaxima.patch
+ # fix LDFLAGS handling in ecl (#378195)
+ epatch "${FILESDIR}"/${PN}-ecl-ldflags.patch
+
# bug #343331
rm share/Makefile.in || die
rm src/Makefile.in || die