diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-12-06 12:47:00 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-12-06 12:47:00 +0000 |
| commit | f9d2bc901256e3a38c92a1c63d20fb540ed946e7 (patch) | |
| tree | 817864ae1912c0266ac31f88f98b22825619ad9e /sci-libs | |
| parent | Use versionator.eclass to distinguish hotfix versions (diff) | |
| download | gentoo-2-f9d2bc901256e3a38c92a1c63d20fb540ed946e7.tar.gz gentoo-2-f9d2bc901256e3a38c92a1c63d20fb540ed946e7.tar.bz2 gentoo-2-f9d2bc901256e3a38c92a1c63d20fb540ed946e7.zip | |
Fix build with USE=dap and openmpi >= 1.4 wrt #347893 by Juergen Rose <rose@rz.uni-potsdam.de>. Drop old.
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/netcdf/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-libs/netcdf/files/netcdf-4.1.1-mpi-fix.patch | 32 | ||||
| -rw-r--r-- | sci-libs/netcdf/netcdf-4.1.1-r3.ebuild (renamed from sci-libs/netcdf/netcdf-4.1.1-r2.ebuild) | 3 |
3 files changed, 42 insertions, 2 deletions
diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog index 8b554bd67803..2c3c735b50a0 100644 --- a/sci-libs/netcdf/ChangeLog +++ b/sci-libs/netcdf/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/netcdf # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.77 2010/12/05 11:38:45 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.78 2010/12/06 12:47:00 xarthisius Exp $ + +*netcdf-4.1.1-r3 (06 Dec 2010) + + 06 Dec 2010; Kacper Kowalik <xarthisius@gentoo.org> -netcdf-4.1.1-r2.ebuild, + +netcdf-4.1.1-r3.ebuild, +files/netcdf-4.1.1-mpi-fix.patch: + Fix build with USE=dap and openmpi >= 1.4 wrt #347893 by Juergen Rose + <rose@rz.uni-potsdam.de>. Drop old. *netcdf-4.1.1-r2 (05 Dec 2010) diff --git a/sci-libs/netcdf/files/netcdf-4.1.1-mpi-fix.patch b/sci-libs/netcdf/files/netcdf-4.1.1-mpi-fix.patch new file mode 100644 index 000000000000..4656ef1e3cbc --- /dev/null +++ b/sci-libs/netcdf/files/netcdf-4.1.1-mpi-fix.patch @@ -0,0 +1,32 @@ +Ensure hdf5.h is included before netcdf.h to avoid build error with openmpi >= 1.4.1 + +--- libsrc4/nc4internal.h ++++ libsrc4/nc4internal.h +@@ -8,13 +8,13 @@ + + #include <config.h> + #include <stdio.h> ++#include <hdf5.h> + #include "error.h" + #include <stdlib.h> + #include <ctype.h> + #include <stdarg.h> + #include <string.h> + #include "netcdf3.h" +-#include <hdf5.h> + #include <netcdf.h> + + #ifdef USE_PARALLEL +--- libncdap4/ncdap4.h ++++ libncdap4/ncdap4.h +@@ -12,9 +12,9 @@ + #include <stdio.h> + + #include "config.h" ++#include "nc4internal.h" + #include "netcdf.h" + #include "nc.h" +-#include "nc4internal.h" + #include "ncdap.h" + #include "getvara.h" + #include "constraints3.h" diff --git a/sci-libs/netcdf/netcdf-4.1.1-r2.ebuild b/sci-libs/netcdf/netcdf-4.1.1-r3.ebuild index 7ff69b8aa4a6..105457c697e5 100644 --- a/sci-libs/netcdf/netcdf-4.1.1-r2.ebuild +++ b/sci-libs/netcdf/netcdf-4.1.1-r3.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-libs/netcdf/netcdf-4.1.1-r2.ebuild,v 1.1 2010/12/05 11:38:45 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.1.1-r3.ebuild,v 1.1 2010/12/06 12:47:00 xarthisius Exp $ EAPI="3" @@ -28,6 +28,7 @@ DOCS=(README RELEASE_NOTES) PATCHES=( "${FILESDIR}"/${P}-parallel-build.patch "${FILESDIR}"/${P}-implicits.patch + "${FILESDIR}"/${P}-mpi-fix.patch ) pkg_setup() { |