summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2011-01-25 05:23:09 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2011-01-25 05:23:09 +0000
commite55bc47ccec41529bf445fe2507e6a005b0813d1 (patch)
treecda56fe1480113d6b86418cdb9a7bc7630b2b3a1 /sci-libs
parentppc/ppc64 stable wrt #345571 (diff)
downloadgentoo-2-e55bc47ccec41529bf445fe2507e6a005b0813d1.tar.gz
gentoo-2-e55bc47ccec41529bf445fe2507e6a005b0813d1.tar.bz2
gentoo-2-e55bc47ccec41529bf445fe2507e6a005b0813d1.zip
Further parallel build fixes wrt #352615 by Juergen Rose <rose@rz.uni-potsdam.de>
(Portage version: 2.2.0_alpha10_p22/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/netcdf/ChangeLog9
-rw-r--r--sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch3
2 files changed, 9 insertions, 3 deletions
diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index 81791748f204..0f3622d26fd5 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,11 @@
# 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.79 2010/12/17 20:17:06 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.80 2011/01/25 05:23:09 xarthisius Exp $
+
+ 25 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
+ files/netcdf-4.1.1-parallel-build.patch:
+ Further parallel build fixes wrt #352615 by Juergen Rose
+ <rose@rz.uni-potsdam.de>
*netcdf-4.1.1-r4 (17 Dec 2010)
diff --git a/sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch b/sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch
index d06e94539664..0d39c9e69b57 100644
--- a/sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch
+++ b/sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch
@@ -4,7 +4,7 @@ https://bugs.gentoo.org/296174
--- netcdf-4.1.1/f90/Makefile.am
+++ netcdf-4.1.1/f90/Makefile.am
-@@ -101,17 +101,23 @@
+@@ -101,17 +101,24 @@
# Some fortran compilers change the file names of .mod files to all
# uppercase. Just to be special.
if UPPER_CASE_MOD
@@ -21,6 +21,7 @@ https://bugs.gentoo.org/296174
+NETCDF_MODULES = typesizes.mod netcdf.mod
endif
++$(NETCDF_O): typeSizes.o
+install-data-local:
+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ @list='$(NETCDF_MODULES)'; test -n "$(includedir)" || list=; \