From a3332fef11e22bdbae2a09b6f623e8c6a234019c Mon Sep 17 00:00:00 2001 From: David Spencer Date: Sun, 7 Aug 2016 12:40:05 +0100 Subject: [PATCH] libraries/netcdf: Enable netcdf-4 support. Signed-off-by: David Spencer --- libraries/netcdf/README | 23 ++++++----------------- libraries/netcdf/netcdf.SlackBuild | 12 ++++++++++-- libraries/netcdf/netcdf.info | 2 +- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/libraries/netcdf/README b/libraries/netcdf/README index 53376f2d41..6f3710b87b 100644 --- a/libraries/netcdf/README +++ b/libraries/netcdf/README @@ -5,22 +5,11 @@ netCDF libraries support a machine-independent format for representing scientific data. Together, the interfaces, libraries, and format support the creation, access, and sharing of scientific data. -NetCDF data is: +Optional HDF4 support +--------------------- - * Self-Describing. A netCDF file includes information about the - data it contains. - * Portable. A netCDF file can be accessed by computers with different - ways of storing integers, characters, and floating- point numbers. - * Scalable. A small subset of a large dataset may be accessed - efficiently. - * Appendable. Data may be appended to a properly structured netCDF - file without copying the dataset or redefining its structure. - * Sharable. One writer and multiple readers may simultaneously access - the same netCDF file. - * Archivable. Access to all earlier forms of netCDF data will be - supported by current and future versions of the software. +If you need support for reading HDF4 files, please build and install the 'hdf' +package from SlackBuilds.org, and then pass the option 'HDF4=yes' to the netcdf +SlackBuild, for example -The netCDF software was developed by Glenn Davis, Russ Rew, Ed Hartnett, -John Caron, Steve Emmerson, and Harvey Davies at the Unidata Program -Center in Boulder, Colorado, with contributions from many other netCDF -users. + HDF4=yes ./netcdf.SlackBuild diff --git a/libraries/netcdf/netcdf.SlackBuild b/libraries/netcdf/netcdf.SlackBuild index 96460017e0..02c14d7261 100644 --- a/libraries/netcdf/netcdf.SlackBuild +++ b/libraries/netcdf/netcdf.SlackBuild @@ -27,7 +27,7 @@ PRGNAM=netcdf SRCNAM=netcdf-c VERSION=${VERSION:-4.4.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -72,6 +72,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +if [ "${HDF4:-no}" = 'yes' ]; then + hdf4opt="--enable-hdf4" +else + hdf4opt="" +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -83,7 +89,9 @@ CXXFLAGS="$SLKCFLAGS" \ --datarootdir=/usr \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-static=no \ - --disable-netcdf-4 \ + --enable-netcdf-4 \ + --enable-dap-netcdf \ + ${hdf4opt} \ --build=$ARCH-slackware-linux make diff --git a/libraries/netcdf/netcdf.info b/libraries/netcdf/netcdf.info index 214bc954fd..4991a803e3 100644 --- a/libraries/netcdf/netcdf.info +++ b/libraries/netcdf/netcdf.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/Unidata/netcdf-c/archive/v4.4.1/netcdf-c-4.4.1.tar. MD5SUM="b4e0308c7753af84034eb0984f2e36a7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="hdf5" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com"