diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2009-07-10 16:18:49 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2009-07-10 16:18:49 +0000 |
| commit | 1523850829459d947a32b67837c2a3a1c7f51abc (patch) | |
| tree | 6ed1bc27c0eaeba075aa02167b75930726536399 /sci-mathematics/octave | |
| parent | Snapshot; because 0.99.14 doesn't compile with >= libmp4v2 1.9.0. (diff) | |
| download | gentoo-2-1523850829459d947a32b67837c2a3a1c7f51abc.tar.gz gentoo-2-1523850829459d947a32b67837c2a3a1c7f51abc.tar.bz2 gentoo-2-1523850829459d947a32b67837c2a3a1c7f51abc.zip | |
Disable linking against arpack until it can be made a dependency (pending keywording on relevant arches). Also split off src_configure() according to EAPI2.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sci-mathematics/octave')
| -rw-r--r-- | sci-mathematics/octave/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-mathematics/octave/octave-3.2.0.ebuild | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog index 382720f00daf..cc5c524ef040 100644 --- a/sci-mathematics/octave/ChangeLog +++ b/sci-mathematics/octave/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-mathematics/octave # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.72 2009/07/10 15:43:57 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.73 2009/07/10 16:18:49 markusle Exp $ + + 10 Jul 2009; Markus Dittrich <markusle@gentoo.org> octave-3.2.0.ebuild: + Disable linking against arpack until it can be made a dependency + (pending keywording on relevant arches). Also split off src_configure() + according to EAPI2. 10 Jul 2009; Markus Dittrich <markusle@gentoo.org> octave-3.2.0.ebuild, +files/octave-3.2.0_as_needed.patch: diff --git a/sci-mathematics/octave/octave-3.2.0.ebuild b/sci-mathematics/octave/octave-3.2.0.ebuild index 18658544505c..1e27f059c4a4 100644 --- a/sci-mathematics/octave/octave-3.2.0.ebuild +++ b/sci-mathematics/octave/octave-3.2.0.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/sci-mathematics/octave/octave-3.2.0.ebuild,v 1.3 2009/07/10 15:43:57 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.2.0.ebuild,v 1.4 2009/07/10 16:18:49 markusle Exp $ EAPI="2" inherit flag-o-matic fortran xemacs-elisp-common @@ -48,10 +48,11 @@ src_prepare() { epatch "${FILESDIR}"/${P}_as_needed.patch } -src_compile() { +src_configure() { econf \ --localstatedir=/var/state/octave \ --enable-shared \ + --without-arpack \ --with-blas="$(pkg-config --libs blas)" \ --with-lapack="$(pkg-config --libs lapack)" \ $(use_with hdf5) \ @@ -64,7 +65,10 @@ src_compile() { $(use_with sparse cholmod) \ $(use_with sparse cxsparse) \ $(use_enable readline) +} + +src_compile() { emake || die "emake failed" if use xemacs; then |