Oops, wrong patch
This commit is contained in:
parent
fda5c162a3
commit
1169240208
@ -1,38 +0,0 @@
|
||||
--- netcdf-4.1-snapshot2009111008/configure.libs 2009-11-10 08:38:04.000000000 -0700
|
||||
+++ netcdf-4.1-snapshot2009111008/configure 2009-11-11 20:24:32.932280524 -0700
|
||||
@@ -3420,7 +3420,7 @@
|
||||
curl_cflags="-I$with_curl/include"
|
||||
curl_dir="$with_curl"
|
||||
else
|
||||
- curl_cflags=-lcurl
|
||||
+ curl_cflags=
|
||||
curl_libs=
|
||||
curl_dir=
|
||||
fi
|
||||
@@ -31317,7 +31317,7 @@
|
||||
LDFLAGS="${LDFLAGS} -L${HDF5DIR}/lib"
|
||||
CPPFLAGS="${CPPFLAGS} -I${HDF5DIR}/include"
|
||||
fi
|
||||
-LIBS="${LIBS} -lm -lz -lhdf5"
|
||||
+LIBS="${LIBS} -lz -lhdf5"
|
||||
|
||||
# Add the HDF4 directory and library if needed.
|
||||
if test "x$enable_hdf4" = xyes; then
|
||||
@@ -33122,7 +33122,7 @@
|
||||
if test "x$ZLIBDIR" != x ; then
|
||||
NC_LIBS="$NC_LIBS -L$ZLIBDIR/lib"
|
||||
fi
|
||||
- NC_LIBS="$NC_LIBS -lz -lm $LIBS"
|
||||
+ NC_LIBS="$NC_LIBS -lz $LIBS"
|
||||
if test "x$SZLIBDIR" != x ; then
|
||||
NC_LIBS="$NC_LIBS -L$SZLIBDIR/lib"
|
||||
NC_LIBS="$NC_LIBS -lsz $LIBS"
|
||||
@@ -33138,7 +33138,7 @@
|
||||
if test "x$with_daplib" != x ; then
|
||||
NC_LIBS="$NC_LIBS -L$with_daplib/lib"
|
||||
fi
|
||||
- NC_LIBS="$NC_LIBS $CURL_LIBS"
|
||||
+ NC_LIBS="$NC_LIBS"
|
||||
fi
|
||||
if test "x$enable_separate_fortran" = xyes ; then
|
||||
NC_FLIBS="-lnetcdff $NC_LIBS"
|
34
netcdf-4.1-beta2-pkgconfig.patch
Normal file
34
netcdf-4.1-beta2-pkgconfig.patch
Normal file
@ -0,0 +1,34 @@
|
||||
diff -up netcdf-4.1-snapshot2010020100/nc-config.in.pkgconfig netcdf-4.1-snapshot2010020100/nc-config.in
|
||||
--- netcdf-4.1-snapshot2010020100/nc-config.in.pkgconfig 2010-01-11 12:27:12.000000000 -0700
|
||||
+++ netcdf-4.1-snapshot2010020100/nc-config.in 2010-02-01 16:04:22.429448744 -0700
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
prefix=@prefix@
|
||||
exec_prefix=${prefix}
|
||||
-libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
cc="@CC@"
|
||||
@@ -16,8 +15,6 @@ cxx="@CXX@"
|
||||
fc="@FC@"
|
||||
cflags=" -I${includedir}"
|
||||
fflags="@FFLAGS@ @MOD_FLAG@${includedir}"
|
||||
-libs="-L${libdir} @NC_LIBS@"
|
||||
-flibs="-L${libdir} @NC_FLIBS@"
|
||||
has_dap="@HAS_DAP@"
|
||||
has_nc2="@HAS_NC2@"
|
||||
has_nc4="@HAS_NC4@"
|
||||
@@ -138,11 +135,11 @@ while test $# -gt 0; do
|
||||
;;
|
||||
|
||||
--libs)
|
||||
- echo $libs
|
||||
+ pkg-config netcdf --libs
|
||||
;;
|
||||
|
||||
--flibs)
|
||||
- echo $flibs
|
||||
+ pkg-config netcdf --flibs
|
||||
;;
|
||||
|
||||
--has-dap)
|
Loading…
Reference in New Issue
Block a user