| 1 |
bicatali 10/01/28 22:19:50 |
| 2 |
|
| 3 |
Added: netcdf-4.0.1-pkgconfig.patch |
| 4 |
netcdf-4.0.1-cfortran.patch |
| 5 |
Log: |
| 6 |
Fixed for mpi, now uses exclusively system cfortran, and cleaned the pkg-config files. Thanks Xarthisius for his help. |
| 7 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-libs/netcdf/files/netcdf-4.0.1-pkgconfig.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/netcdf/files/netcdf-4.0.1-pkgconfig.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/netcdf/files/netcdf-4.0.1-pkgconfig.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: netcdf-4.0.1-pkgconfig.patch |
| 16 |
=================================================================== |
| 17 |
diff -Nru netcdf-4.0.1.orig/configure.ac netcdf-4.0.1/configure.ac |
| 18 |
--- netcdf-4.0.1.orig/configure.ac 2009-03-26 12:10:02.000000000 +0000 |
| 19 |
+++ netcdf-4.0.1/configure.ac 2010-01-28 22:10:56.000000000 +0000 |
| 20 |
@@ -1159,11 +1159,11 @@ |
| 21 |
fi |
| 22 |
if test "x$enable_netcdf_4" = xyes ; then |
| 23 |
if test "x$HDF5DIR" != x ; then |
| 24 |
- NC_LIBS="$NC_LIBS -L$HDF5DIR" |
| 25 |
+ NC_LIBS="$NC_LIBS -L$HDF5DIR/lib" |
| 26 |
fi |
| 27 |
NC_LIBS="$NC_LIBS -lhdf5_hl -lhdf5 $SZLIB_LIBS" |
| 28 |
if test "x$ZLIBDIR" != x ; then |
| 29 |
- NC_LIBS="$NC_LIBS -L$ZLIBDIR" |
| 30 |
+ NC_LIBS="$NC_LIBS -L$ZLIBDIR/lib" |
| 31 |
fi |
| 32 |
NC_LIBS="$NC_LIBS -lz $LIBS" |
| 33 |
fi |
| 34 |
diff -Nru netcdf-4.0.1.orig/nc-config.in netcdf-4.0.1/nc-config.in |
| 35 |
--- netcdf-4.0.1.orig/nc-config.in 2009-03-18 20:28:46.000000000 +0000 |
| 36 |
+++ netcdf-4.0.1/nc-config.in 2010-01-28 21:48:02.000000000 +0000 |
| 37 |
@@ -4,9 +4,9 @@ |
| 38 |
# |
| 39 |
|
| 40 |
prefix=@prefix@ |
| 41 |
-exec_prefix=${prefix} |
| 42 |
-libdir=${exec_prefix}/lib |
| 43 |
-includedir=${prefix}/include |
| 44 |
+exec_prefix=@exec_prefix@ |
| 45 |
+libdir=@libdir@ |
| 46 |
+includedir=@includedir@ |
| 47 |
|
| 48 |
cc="@CC@" |
| 49 |
cxx="@CXX@" |
| 50 |
diff -Nru netcdf-4.0.1.orig/netcdf.pc.in netcdf-4.0.1/netcdf.pc.in |
| 51 |
--- netcdf-4.0.1.orig/netcdf.pc.in 2009-03-19 12:22:33.000000000 +0000 |
| 52 |
+++ netcdf-4.0.1/netcdf.pc.in 2010-01-28 22:11:32.000000000 +0000 |
| 53 |
@@ -6,7 +6,7 @@ |
| 54 |
cppcompiler=@CXX@ |
| 55 |
fcompiler=@FC@ |
| 56 |
fflags=@FFLAGS@ -I${includedir} |
| 57 |
-flibs=@FLIBS@ @NC_FLIBS@ |
| 58 |
+flibs=@NC_FLIBS@ |
| 59 |
|
| 60 |
Name: @PACKAGE@ |
| 61 |
Description: NetCDF Client Library |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.1 sci-libs/netcdf/files/netcdf-4.0.1-cfortran.patch |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/netcdf/files/netcdf-4.0.1-cfortran.patch?rev=1.1&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/netcdf/files/netcdf-4.0.1-cfortran.patch?rev=1.1&content-type=text/plain |
| 69 |
|
| 70 |
Index: netcdf-4.0.1-cfortran.patch |
| 71 |
=================================================================== |
| 72 |
--- netcdf-4.0.1.orig/configure.ac 2009-03-26 13:10:02.000000000 +0100 |
| 73 |
+++ netcdf-4.0.1/configure.ac 2010-01-28 19:01:47.156238559 +0100 |
| 74 |
@@ -801,7 +801,7 @@ |
| 75 |
*) |
| 76 |
# If it's a gnu compiler, guess f2c. |
| 77 |
if test "x$ac_cv_fc_compiler_gnu" = xyes; then |
| 78 |
- AC_DEFINE(f2cFortran, [1], [Turned on by netCDF configure.]) |
| 79 |
+ AC_DEFINE(gFortran, [1], [Turned on by netCDF configure.]) |
| 80 |
fi |
| 81 |
;; |
| 82 |
esac |
| 83 |
|
| 84 |
--- netcdf-4.0.1.orig/fortran/ncfortran.h 2009-02-19 13:50:25.000000000 +0100 |
| 85 |
+++ netcdf-4.0.1/fortran/ncfortran.h 2009-09-24 21:10:08.000000000 +0200 |
| 86 |
@@ -660,7 +660,7 @@ |
| 87 |
* The following is for f2c-support only. |
| 88 |
*/ |
| 89 |
|
| 90 |
-#if defined(f2cFortran) && !defined(pgiFortran) |
| 91 |
+#if defined(f2cFortran) && !defined(pgiFortran) && !defined(gFortran) |
| 92 |
|
| 93 |
/* |
| 94 |
* The f2c(1) utility on BSD/OS and Linux systems adds an additional |
| 95 |
--- netcdf-4.0.1.orig/nf_test/fortlib.c 2009-09-24 21:11:12.000000000 +0200 |
| 96 |
+++ netcdf-4.0.1/nf_test/fortlib.c 2009-09-24 21:11:36.000000000 +0200 |
| 97 |
@@ -14,7 +14,7 @@ |
| 98 |
#include "../fortran/ncfortran.h" |
| 99 |
|
| 100 |
|
| 101 |
-#if defined(f2cFortran) && !defined(pgiFortran) |
| 102 |
+#if defined(f2cFortran) && !defined(pgiFortran) && !defined(gFortran) |
| 103 |
/* |
| 104 |
* The f2c(1) utility on BSD/OS and Linux systems adds an additional |
| 105 |
* underscore suffix (besides the usual one) to global names that have |
Archives