diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2010-02-12 03:20:21 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2010-02-12 03:20:21 +0000 |
| commit | 6db5c6597e4eea8be0de28d2b77ce9859ee07ad0 (patch) | |
| tree | bedb5ed969ca36329d0c429c4994431d032a5887 /sci-mathematics | |
| parent | Drop old ebuild (diff) | |
| download | historical-6db5c6597e4eea8be0de28d2b77ce9859ee07ad0.tar.gz historical-6db5c6597e4eea8be0de28d2b77ce9859ee07ad0.tar.bz2 historical-6db5c6597e4eea8be0de28d2b77ce9859ee07ad0.zip | |
If hdf5 is compiled against MPI we need to use the mpi wrappers to compile octave to avoid linker errors (#302621, #303391).
Package-Manager: portage-2.1.7.17/cvs/Linux x86_64
Diffstat (limited to 'sci-mathematics')
| -rw-r--r-- | sci-mathematics/octave/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-mathematics/octave/Manifest | 14 | ||||
| -rw-r--r-- | sci-mathematics/octave/octave-3.2.4.ebuild | 10 |
3 files changed, 16 insertions, 14 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog index c63328793974..90f33f5ef1e9 100644 --- a/sci-mathematics/octave/ChangeLog +++ b/sci-mathematics/octave/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-mathematics/octave # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.82 2010/02/03 10:14:06 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.83 2010/02/12 03:20:21 markusle Exp $ + + 12 Feb 2010; Markus Dittrich <markusle@gentoo.org> octave-3.2.4.ebuild: + If hdf5 is compiled against MPI we need to use the mpi wrappers to compile + octave to avoid linker errors (#302621, #303391). 03 Feb 2010; Christian Faulhammer <fauli@gentoo.org> octave-3.2.3-r1.ebuild: diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest index 0e27e35577df..02d8da7529e8 100644 --- a/sci-mathematics/octave/Manifest +++ b/sci-mathematics/octave/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX octave-2.1.72-gcc4.1-gentoo.patch 4224 RMD160 d179b48f2e47e0e9b2312b3b21cc625ecaeb2e9a SHA1 54da4d74cb5d172310de64fc6cc9e32d56823e82 SHA256 24f0ccb8c2aa4004bd251f0095b8a83417f320326ba99a0bba46f8b178722a66 AUX octave-2.1.73-f2c-fix.patch 419 RMD160 3f8768b9073bcd2d93a5c6064d518299ad0b86a6 SHA1 3c4ee31b5d85d1d8c5f523f39ea25a4a2e577b0d SHA256 18c29afa2402e562cf11ac5a0c7718ed5c9713846dfd0245b2930aaa1939fa41 AUX octave-2.1.73-gcc-4.3.patch 8087 RMD160 b2d9bbb8f012b6fe9106594394627fd76f112ef9 SHA1 fb5407e628ed4ecbb1ab5c0bb43a595ca2e7bbb1 SHA256 d4a080e57562163c36ab435ba09a94fa4e748a9c91f700625706967e1c0092f6 @@ -28,13 +25,6 @@ EBUILD octave-2.1.73-r2.ebuild 4593 RMD160 57768e35057cf967aad85d0be56f9381f6c35 EBUILD octave-2.1.73.ebuild 4254 RMD160 fedeb9bb23ddcc88b60ac4110975834b3e254d13 SHA1 b19e77a0ef495ae0e09e6b750f2307357e154db2 SHA256 121a531d99733d9b8e53f26574caf52dd1c3d34ab15ab2b981061ef9bf8b245c EBUILD octave-3.0.3.ebuild 2681 RMD160 b2b31461e4b4fa71b5d4a9cd3c7616f005165958 SHA1 3ccfbfca3c9c8c5d0c9ae81b9bf0f26118c696d1 SHA256 190ff7f058e1bfc39c267511a16f91cda59e718b4e457fdf90c1eb3dc63b729a EBUILD octave-3.2.3-r1.ebuild 2532 RMD160 36f18ceeb2d84752907529c4c43a485c7b332558 SHA1 76982cb317cd0987c767c551055c096e1bc6ae17 SHA256 b994db4c6bd8fa3c70237623c37181be400c0f7047d367351e687108d2ad1442 -EBUILD octave-3.2.4.ebuild 2730 RMD160 d9ef3541473adec71efec41ea4d102cd7133d0aa SHA1 f34b66cfeb631ef470079d918ddca7e38065304f SHA256 06a07682b3f3683c74eba9a895a408b566d7a338bd7ebc0cd338e604f9a5bc5f -MISC ChangeLog 21503 RMD160 7326ee7b0d30821dfb05405ffbd50f98c1ac371a SHA1 9fbcc7c5d1d5b43acf8cf86a52f263bc45ff3c5c SHA256 dec976a459d48050956a2246f057334a10659b862550c13b2a9dc51bc199c393 +EBUILD octave-3.2.4.ebuild 2924 RMD160 c5c5d6e0ab1b66cf7f85b9a1efee62f99f5dd279 SHA1 8be8a4f103376b18678ac276a1ef3c4d26c16b39 SHA256 d483fb3e18f75ba20940acdd03d7258e2c13ebd0219331f07597543c7fecaba6 +MISC ChangeLog 21711 RMD160 c6ba1a4e217e4b03d41f12fa4f8442b5ef44e267 SHA1 9c3c3fbda10889a0ff89d5dbf9c8fa2a2e863efb SHA256 0f44b2d849f71e35e17adde40b17f18fc9066fe9387b88195047e8ab47780a1a MISC metadata.xml 260 RMD160 27a4292b758e1199d0092b731cba79033f1b4167 SHA1 9997a99a4d6115f3b901208ba711d735ce9be36e SHA256 5fda55fd44bfec5755e1c3ac828887c37f0eebed6b3b972454e123ac2472d3ff ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAktpTHQACgkQNQqtfCuFneMbigCggzmXih0EIZ1cFmCP3TcwT3AA -dDkAnjrvCk+pEDMyICSMJpUvhOusih4y -=bkjL ------END PGP SIGNATURE----- diff --git a/sci-mathematics/octave/octave-3.2.4.ebuild b/sci-mathematics/octave/octave-3.2.4.ebuild index 614097aa96b0..ede3b2d5fe53 100644 --- a/sci-mathematics/octave/octave-3.2.4.ebuild +++ b/sci-mathematics/octave/octave-3.2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.2.4.ebuild,v 1.1 2010/02/01 07:09:46 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.2.4.ebuild,v 1.2 2010/02/12 03:20:21 markusle Exp $ EAPI="2" inherit flag-o-matic xemacs-elisp-common @@ -50,6 +50,14 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${PN}-3.2.0_parallel_make.patch epatch "${FILESDIR}"/${PN}-3.2.0_as_needed.patch + + # without this we get MPI linker errors if hdf5 + # was compiled against mpi (see #302621) + if has_version sci-libs/hdf5[mpi]; then + export CC=mpicc + export FC=mpif90 + export CXX=mpicxx + fi } src_configure() { |