summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarijn Schouten <hkbst@gentoo.org>2009-01-08 15:20:04 +0000
committerMarijn Schouten <hkbst@gentoo.org>2009-01-08 15:20:04 +0000
commitaf0818e866e64b693983f1d194a4b27592b6bcfd (patch)
treea38f7acfafa41c68830a1ac4699020690fecc42e /dev-lisp
parentVersion bumped. (diff)
downloadgentoo-2-af0818e866e64b693983f1d194a4b27592b6bcfd.tar.gz
gentoo-2-af0818e866e64b693983f1d194a4b27592b6bcfd.tar.bz2
gentoo-2-af0818e866e64b693983f1d194a4b27592b6bcfd.zip
fix pari doesn't compile
(Portage version: 2.1.6.4/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'dev-lisp')
-rw-r--r--dev-lisp/clisp/ChangeLog6
-rw-r--r--dev-lisp/clisp/clisp-2.47-r1.ebuild4
-rw-r--r--dev-lisp/clisp/files/pari.patch25
3 files changed, 33 insertions, 2 deletions
diff --git a/dev-lisp/clisp/ChangeLog b/dev-lisp/clisp/ChangeLog
index 4730fa49f042..ea32e4df6809 100644
--- a/dev-lisp/clisp/ChangeLog
+++ b/dev-lisp/clisp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lisp/clisp
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.88 2009/01/07 13:12:02 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.89 2009/01/08 15:20:03 hkbst Exp $
+
+ 08 Jan 2009; Marijn Schouten <hkBst@gentoo.org> +files/pari.patch,
+ clisp-2.47-r1.ebuild:
+ fix pari doesn't compile
*clisp-2.47-r1 (07 Jan 2009)
diff --git a/dev-lisp/clisp/clisp-2.47-r1.ebuild b/dev-lisp/clisp/clisp-2.47-r1.ebuild
index b477b52f0289..76d4b9e59aec 100644
--- a/dev-lisp/clisp/clisp-2.47-r1.ebuild
+++ b/dev-lisp/clisp/clisp-2.47-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.47-r1.ebuild,v 1.1 2009/01/07 13:12:02 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.47-r1.ebuild,v 1.2 2009/01/08 15:20:03 hkbst Exp $
inherit flag-o-matic eutils toolchain-funcs multilib
@@ -58,6 +58,8 @@ src_unpack() {
unpack ${A}
cd "${S}"
+ epatch "${FILESDIR}"/pari.patch #bug 246074
+
# More than -O1 breaks alpha/ia64
use alpha || use ia64 && sed -i -e 's/-O2//g' src/makemake.in
}
diff --git a/dev-lisp/clisp/files/pari.patch b/dev-lisp/clisp/files/pari.patch
new file mode 100644
index 000000000000..420dd0a5b2fb
--- /dev/null
+++ b/dev-lisp/clisp/files/pari.patch
@@ -0,0 +1,25 @@
+commit d6d89b33bee20879c4cef3b7fcc9c4d42c4b6eff
+Author: sds <sds>
+Date: Thu Jan 8 02:56:33 2009 +0000
+
+ fix bug #[ 2492106 ]: CLISP 2.47/amd64 can't build "pari" module
+ (new_galois_format, factor_add_primes): fix type declarations
+
+diff --git a/modules/pari/pari.lisp b/modules/pari/pari.lisp
+index d5cf89d..d5586d3 100644
+--- a/modules/pari/pari.lisp
++++ b/modules/pari/pari.lisp
+@@ -165,9 +165,9 @@
+ (and e (foreign-value e))))
+
+ ;; extern int new_galois_format;
+-(def-c-var new_galois_format (:type (c-ptr int)))
++(def-c-var new_galois_format (:type int))
+ ;; extern int factor_add_primes;
+-(def-c-var factor_add_primes (:type (c-ptr int)))
++(def-c-var factor_add_primes (:type int))
+
+ ;; extern ulong DEBUGFILES, DEBUGLEVEL, DEBUGMEM
+ (def-c-var debugfiles (:name "DEBUGFILES") (:type ulong))
+diff --git a/src/ChangeLog b/src/ChangeLog
+index 4f386a3..410b02b 100644