summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2004-03-17 21:53:29 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2004-03-17 21:53:29 +0000
commitaa9f50ebb684e423984b9328590099fccdc2e7ee (patch)
tree0e309dce933abc3a8df7ff672f9806cd50a3d10c /app-sci
parentAdding amd64 keyword. (Manifest recommit) (diff)
downloadgentoo-2-aa9f50ebb684e423984b9328590099fccdc2e7ee.tar.gz
gentoo-2-aa9f50ebb684e423984b9328590099fccdc2e7ee.tar.bz2
gentoo-2-aa9f50ebb684e423984b9328590099fccdc2e7ee.zip
Closing #42350.
Diffstat (limited to 'app-sci')
-rw-r--r--app-sci/octave-forge/ChangeLog6
-rw-r--r--app-sci/octave-forge/files/octave-forge-2004.02.12-fPIC.patch20
-rw-r--r--app-sci/octave-forge/octave-forge-2004.02.12.ebuild10
3 files changed, 32 insertions, 4 deletions
diff --git a/app-sci/octave-forge/ChangeLog b/app-sci/octave-forge/ChangeLog
index 7aba07df1604..479e4546eb9f 100644
--- a/app-sci/octave-forge/ChangeLog
+++ b/app-sci/octave-forge/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-sci/octave-forge
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-sci/octave-forge/ChangeLog,v 1.7 2004/03/10 13:00:08 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/octave-forge/ChangeLog,v 1.8 2004/03/17 21:53:29 aliz Exp $
+
+ 17 Mar 2004; Daniel Ahlberg <aliz@gentoo.org>
+ octave-forge-2004.02.12.ebuild:
+ Adding amd64 keyword. Closing #42350.
*octave-forge-2004.02.12 (10 Mar 2004)
diff --git a/app-sci/octave-forge/files/octave-forge-2004.02.12-fPIC.patch b/app-sci/octave-forge/files/octave-forge-2004.02.12-fPIC.patch
new file mode 100644
index 000000000000..6d6c451d04cb
--- /dev/null
+++ b/app-sci/octave-forge/files/octave-forge-2004.02.12-fPIC.patch
@@ -0,0 +1,20 @@
+--- main/miscellaneous/Makefile 2004-03-17 20:49:42.021540006 +0000
++++ main/miscellaneous/Makefile 2004-03-17 20:51:52.258546237 +0000
+@@ -23,7 +23,7 @@
+ $(MKOCTFILE) -c listencanfork.c
+
+ xmltree.o: xmltree.c xmltree.h
+- $(CC) -c $< -o $@
++ $(CC) -fPIC -c $< -o $@
+
+ ifdef FLEXML
+ xmltree_read.l: xmltree_read.act octave.dtd
+@@ -36,7 +36,7 @@
+ endif
+
+ xmltree_read.o: xmltree_read.c xmltree_read.h
+- $(CC) -c $< -o $@
++ $(CC) -fPIC -c $< -o $@
+
+ xmlread.o: xmlread.cc xmltree_read.h xmltree.h
+ $(MKOCTFILE) -c $< -o $@
diff --git a/app-sci/octave-forge/octave-forge-2004.02.12.ebuild b/app-sci/octave-forge/octave-forge-2004.02.12.ebuild
index 21a977df3c0a..eae4882a97e8 100644
--- a/app-sci/octave-forge/octave-forge-2004.02.12.ebuild
+++ b/app-sci/octave-forge/octave-forge-2004.02.12.ebuild
@@ -1,20 +1,22 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/octave-forge/octave-forge-2004.02.12.ebuild,v 1.1 2004/03/10 13:00:08 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/octave-forge/octave-forge-2004.02.12.ebuild,v 1.2 2004/03/17 21:53:29 aliz Exp $
+
+inherit eutils
DESCRIPTION="A collection of custom scripts, functions and extensions for GNU Octave"
HOMEPAGE="http://octave.sourceforge.net/"
SRC_URI="mirror://sourceforge/octave/${P}.tar.gz"
LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
SLOT="0"
IUSE="ginac qhull"
DEPEND=">=app-sci/octave-2.1.40
>=sys-apps/sed-4
sys-libs/libtermcap-compat
- ginac? ( app-sci/ginac )
+ !amd64? ( ginac? ( app-sci/ginac ) )
qhull? ( >=media-libs/qhull-3.1-r1 )"
src_unpack() {
@@ -23,6 +25,8 @@ src_unpack() {
sed -e 's:a"key":a["key"]:' -i configure || die "sed failed on configure"
sed -e 's:\(^man1dir = \):\1$(DESTDIR)/:; s:$(bindir):$(DESTDIR)/$(bindir):' -i extra/mex/Makefile \
|| die "sed failed on mex/Makefile"
+
+ epatch ${FILESDIR}/${P}-fPIC.patch
}
src_compile() {