summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2007-09-29 08:12:06 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2007-09-29 08:12:06 +0000
commit6f0b48d054c14396b08d7c1d9729966d6fe03766 (patch)
tree25080aaeddae72f02123908a0422d0a8602ee8c9 /sci-libs/netcdf
parentFix quoting around D. (diff)
downloadgentoo-2-6f0b48d054c14396b08d7c1d9729966d6fe03766.tar.gz
gentoo-2-6f0b48d054c14396b08d7c1d9729966d6fe03766.tar.bz2
gentoo-2-6f0b48d054c14396b08d7c1d9729966d6fe03766.zip
fixed again the paralell make patch
(Portage version: 2.1.3.9)
Diffstat (limited to 'sci-libs/netcdf')
-rw-r--r--sci-libs/netcdf/ChangeLog6
-rw-r--r--sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch6
2 files changed, 9 insertions, 3 deletions
diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index dd7e5139afed..bb61c104e40b 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/netcdf
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.38 2007/09/28 11:25:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.39 2007/09/29 08:12:05 bicatali Exp $
+
+ 29 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
+ files/netcdf-3.6.2-parallel-make.patch:
+ fixed again the paralell make patch
28 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
files/netcdf-3.6.2-parallel-make.patch, netcdf-3.6.2.ebuild:
diff --git a/sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch b/sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch
index 466bc333c9a0..17fdbfec11a4 100644
--- a/sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch
+++ b/sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch
@@ -1,5 +1,5 @@
--- f90/Makefile.am.orig 2007-03-01 19:46:10.000000000 +0000
-+++ f90/Makefile.am 2007-09-28 12:11:09.488085153 +0100
++++ f90/Makefile.am 2007-09-29 09:09:39.626908874 +0100
@@ -37,7 +37,7 @@
libnetcdff90_la_DEPENDENCIES += netcdf4_func.f90 netcdf4_externals.f90 \
netcdf4_visibility.f90 netcdf4_constants.f90 netcdf4.f90
@@ -18,7 +18,7 @@
endif # USE_NETCDF4
-@@ -62,12 +62,14 @@
+@@ -62,12 +62,16 @@
# uppercase. Just to be special.
if UPPER_CASE_MOD
nodist_include_HEADERS = TYPESIZES.mod NETCDF.mod
@@ -27,6 +27,7 @@
+TYPESIZES.mod: typeSizes.o typeSizes.lo
+NETCDF.mod: $(NETCDF_).o $(NETCDF_).lo
+$(NETCDF_).o : TYPESIZES.mod
++$(NETCDF_).lo : TYPESIZES.mod
else
nodist_include_HEADERS = typesizes.mod netcdf.mod
-typesizes.mod: typeSizes.o
@@ -34,6 +35,7 @@
+typesizes.mod: typeSizes.o typeSizes.lo
+netcdf.mod: $(NETCDF_).o $(NETCDF_).lo
+$(NETCDF_).o : typesizes.mod
++$(NETCDF_).lo : typesizes.mod
endif
# This is what we are building: a convenience library of F90 functions.