[gentoo-commits] gentoo-x86 commit in sci-libs/netcdf/files: netcdf-3.6.2-parallel-make.patch

[Sebastien Fabbro (bicatali)]

bicatali    07/09/28 11:25:10

  Modified:             netcdf-3.6.2-parallel-make.patch
  Log:
  Fixes parallell make with -j2 (real this time), uses FFLAGS for fortran 90 and do not remove .la files.
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.2                  sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch?r1=1.1&r2=1.2

Index: netcdf-3.6.2-parallel-make.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netcdf-3.6.2-parallel-make.patch	5 Aug 2007 12:07:03 -0000	1.1
+++ netcdf-3.6.2-parallel-make.patch	28 Sep 2007 11:25:09 -0000	1.2
@@ -1,15 +1,39 @@
---- f90/Makefile.am	2007/08/04 22:02:56	1.1
-+++ f90/Makefile.am	2007/08/04 22:09:55
-@@ -64,10 +64,12 @@ if UPPER_CASE_MOD
+--- f90/Makefile.am.orig	2007-03-01 19:46:10.000000000 +0000
++++ f90/Makefile.am	2007-09-28 12:11:09.488085153 +0100
+@@ -37,7 +37,7 @@
+ libnetcdff90_la_DEPENDENCIES += netcdf4_func.f90 netcdf4_externals.f90	\
+ netcdf4_visibility.f90 netcdf4_constants.f90 netcdf4.f90
+ 
+-NETCDF_O = netcdf4.o
++NETCDF_ = netcdf4
+ 
+ else # not USE_NETCDF4
+ 
+@@ -48,7 +48,7 @@
+ libnetcdff90_la_SOURCES += netcdf.f90
+ libnetcdff90_la_DEPENDENCIES += netcdf.f90
+ 
+-NETCDF_O = netcdf.o
++NETCDF_ = netcdf
+ 
+ endif # USE_NETCDF4
+ 
+@@ -62,12 +62,14 @@
+ # uppercase. Just to be special.
+ if UPPER_CASE_MOD
  nodist_include_HEADERS = TYPESIZES.mod NETCDF.mod
- TYPESIZES.mod: typeSizes.o
- NETCDF.mod: $(NETCDF_O)
-+$(NETCDF_O): TYPESIZES.mod
+-TYPESIZES.mod: typeSizes.o
+-NETCDF.mod: $(NETCDF_O)
++TYPESIZES.mod: typeSizes.o typeSizes.lo
++NETCDF.mod: $(NETCDF_).o $(NETCDF_).lo
++$(NETCDF_).o : TYPESIZES.mod
  else
  nodist_include_HEADERS = typesizes.mod netcdf.mod 
- typesizes.mod: typeSizes.o
- netcdf.mod: $(NETCDF_O)
-+$(NETCDF_O): typesizes.mod
+-typesizes.mod: typeSizes.o
+-netcdf.mod: $(NETCDF_O)
++typesizes.mod: typeSizes.o typeSizes.lo
++netcdf.mod: $(NETCDF_).o $(NETCDF_).lo
++$(NETCDF_).o : typesizes.mod
  endif
  
  # This is what we are building: a convenience library of F90 functions.



-- 
gentoo-commits@g.o mailing list