summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2011-01-29 20:17:39 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2011-01-29 20:17:39 +0000
commit9f5d280d5bba788521f1b9f4b7e4d5958cad0d67 (patch)
treea5015ccd64870a374d9c148b973397e81154c69b /sci-libs
parentFix building with x11-libs/libnotify >= 0.7. (diff)
downloadgentoo-2-9f5d280d5bba788521f1b9f4b7e4d5958cad0d67.tar.gz
gentoo-2-9f5d280d5bba788521f1b9f4b7e4d5958cad0d67.tar.bz2
gentoo-2-9f5d280d5bba788521f1b9f4b7e4d5958cad0d67.zip
Attempt to fix parallel issues once and for all, wrt #296174 c#14
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/netcdf/ChangeLog6
-rw-r--r--sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch5
2 files changed, 8 insertions, 3 deletions
diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index 0f3622d26fd5..0ffa5890cd77 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/netcdf
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.81 2011/01/29 20:17:39 xarthisius Exp $
+
+ 29 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
+ files/netcdf-4.1.1-parallel-build.patch:
+ Attempt to fix parallel issues once and for all, wrt #296174 c#14
25 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
files/netcdf-4.1.1-parallel-build.patch:
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 0d39c9e69b57..22708e2201e9 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,24 @@
+@@ -101,17 +101,25 @@
# Some fortran compilers change the file names of .mod files to all
# uppercase. Just to be special.
if UPPER_CASE_MOD
@@ -21,7 +21,8 @@ https://bugs.gentoo.org/296174
+NETCDF_MODULES = typesizes.mod netcdf.mod
endif
-+$(NETCDF_O): typeSizes.o
++NETCDF_LO := $(NETCDF_O:.o=.lo)
++$(NETCDF_LO): typeSizes.o
+install-data-local:
+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ @list='$(NETCDF_MODULES)'; test -n "$(includedir)" || list=; \