Skip to content
Commits on Source (11)
Show whitespace changes
Inline Side-by-side
.gitignore
View file @ d272781d
dap4_test/findtestserver4.c
ncdap_test/findtestserver.c
#####
# End ignored generated files.
#####
### 'Normal' gitignore files.
autom4te.cache
debug.txt
......
.travis.yml
View file @ d272781d
......@@ -37,4 +37,4 @@ before_install:
script:
- docker run --rm -it -h "$CURHOST" -e USEDASH=FALSE -e RUNF=OFF -e RUNCXX=OFF -e RUNP=OFF -e RUNNCO=OFF -e USECMAKE=$USECMAKE -e USEAC=$USEAC -e DISTCHECK=$DISTCHECK -e COPTS="$COPTS" -e AC_OPTS="$AC_OPTS" -e CTEST_OUTPUT_ON_FAILURE=1 -v $(pwd):/netcdf-c -e USE_LOCAL_CP=$USECP -e TESTPROC=100 -e ENABLE_FILTER_TESTING=$TESTFILTER $DOCKIMG
- docker run --privileged --rm -it -h "$CURHOST" -e USEDASH=FALSE -e RUNF=OFF -e RUNCXX=OFF -e RUNP=OFF -e RUNNCO=OFF -e USECMAKE=$USECMAKE -e USEAC=$USEAC -e DISTCHECK=$DISTCHECK -e COPTS="$COPTS" -e AC_OPTS="$AC_OPTS" -e CTEST_OUTPUT_ON_FAILURE=1 -v $(pwd):/netcdf-c -e USE_LOCAL_CP=$USECP -e TESTPROC=100 -e ENABLE_FILTER_TESTING=$TESTFILTER -e ENABLE_C_MEMCHECK=OFF $DOCKIMG
CMakeLists.txt
View file @ d272781d
......@@ -26,13 +26,13 @@ set(PACKAGE "netCDF" CACHE STRING "")
SET(NC_VERSION_MAJOR 4)
SET(NC_VERSION_MINOR 6)
SET(NC_VERSION_PATCH 2)
SET(NC_VERSION_NOTE ".1")
SET(NC_VERSION_PATCH 3)
SET(NC_VERSION_NOTE "")
SET(netCDF_VERSION ${NC_VERSION_MAJOR}.${NC_VERSION_MINOR}.${NC_VERSION_PATCH}${NC_VERSION_NOTE})
SET(VERSION ${netCDF_VERSION})
SET(NC_VERSION ${netCDF_VERSION})
SET(netCDF_LIB_VERSION 13)
SET(netCDF_SO_VERSION 13)
SET(netCDF_LIB_VERSION 15)
SET(netCDF_SO_VERSION 15)
SET(PACKAGE_VERSION ${VERSION})
# Get system configuration, Use it to determine osname, os release, cpu. These
......@@ -737,6 +737,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_libver_bounds "" HDF5_HAS_LIBVER_BOUNDS)
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HDF5_HAS_H5FREE)
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5allocate_memory "" HDF5_HAS_ALLOCATE_MEMORY)
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5resize_memory "" HDF5_HAS_RESIZE_MEMORY)
IF(HDF5_PARALLEL)
SET(HDF5_CC h5pcc)
......@@ -1845,7 +1847,7 @@ FOREACH(_LIB ${ALL_TLL_LIBS})
LIST(APPEND LINKFLAGS "-L${_LIB_DIR}")
ENDFOREACH()
SET(NC_LIBS "-lnetcdf ${NC_LIBS}")
#SET(NC_LIBS "-lnetcdf ${NC_LIBS}")
STRING(REPLACE ";" " " NC_LIBS "${NC_LIBS}")
STRING(REPLACE "-lhdf5::hdf5-shared" "-lhdf5" NC_LIBS ${NC_LIBS})
......@@ -1859,6 +1861,9 @@ STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}")
LIST(REMOVE_DUPLICATES NC_LIBS)
LIST(REMOVE_DUPLICATES LINKFLAGS)
SET(LIBS ${NC_LIBS})
SET(NC_LIBS "-lnetcdf")
configure_file(
${netCDF_SOURCE_DIR}/netcdf.pc.in
${netCDF_BINARY_DIR}/netcdf.pc @ONLY)
......@@ -1919,10 +1924,6 @@ SET(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BU
is_disabled(BUILD_SHARED_LIBS enable_static)
is_enabled(BUILD_SHARED_LIBS enable_shared)
# Remove libnetcdf from NC_LIBS.
STRING(REPLACE "-lnetcdf " "" TMP_NC_LIBS "${NC_LIBS}")
SET(LIBS "${TMP_NC_LIBS}")
is_enabled(ENABLE_V2_API HAS_NC2)
is_enabled(ENABLE_NETCDF_4 HAS_NC4)
is_enabled(ENABLE_HDF4 HAS_HDF4)
......
RELEASE_NOTES.md
View file @ d272781d
......@@ -5,15 +5,16 @@ Release Notes {#RELEASE_NOTES}
This file contains a high-level description of this package's evolution. Releases are in reverse chronological order (most recent first). Note that, as of netcdf 4.2, the `netcdf-c++` and `netcdf-fortran` libraries have been separated into their own libraries.
## 4.6.3 - TBD
## 4.6.2.1 - February 15, 2019
### Maintenance Release
## 4.6.3 - February 28, 2019
* [Bug Fix] Correctly generated `netcdf.pc` generated either by `configure` or `cmake`. If linking against a static netcdf, you would need to pass the `--static` argument to `pkg-config` in order to list all of the downstream dependencies. See [Github #1324](https://github.com/Unidata/netcdf-c/issues/1324) for more information.
* Now always write hidden coordinates attribute, which allows faster file opens when present. See [Github #1262](https://github.com/Unidata/netcdf-c/issues/1262) for more information.
* Some fixes for rename, including fix for renumbering of varids after a rename (#1307), renaming var to dim without coordinate var. See [Github #1297](https://github.com/Unidata/netcdf-c/issues/1297).
* Fix of NULL parameter causing segfaults in put_vars functions. See [Github #1265](https://github.com/Unidata/netcdf-c/issues/1265) for more information.
* Fix of --enable-benchmark benchmark tests [Github #1211](https://github.com/Unidata/netcdf-c/issues/1211)
* Update the license from the home-brewed NetCDF license to the standard 3-Clause BSD License. This change does not result in any new restrictions; it is merely the adoption of a standard, well-known and well-understood license in place of the historic NetCDF license written at Unidata. This is part of a broader push by Unidata to adopt modern, standardized licensing.
* [BugFix] Corrected DAP-releated issues on big-endian machines. See [Github #1321](https://github.com/Unidata/netcdf-c/issues/1321), [Github #1302](https://github.com/Unidata/netcdf-c/issues/1302) for more information.
* [BugFix][Enhancement] Various and sundry bugfixes and performance enhancements, thanks got @edhartnett, @gsjaardema, @t-b, @wkliao, and all of our other contributors.
* [BugFix][Enhancement] Various and sundry bugfixes and performance enhancements, thanks to \@edhartnett, \@gsjaardema, \@t-b, \@wkliao, and all of our other contributors.
* [Enhancement] Extended `nccopy -F` syntax to support multiple variables with a single invocation. See [Github #1311](https://github.com/Unidata/netcdf-c/issues/1311) for more information.
* [BugFix] Corrected an issue where DAP2 was incorrectly converting signed bytes, resulting in an erroneous error message under some circumstances. See [GitHub #1317](https://github.com/Unidata/netcdf-c/issues/1317) for more information. See [Github #1319](https://github.com/Unidata/netcdf-c/issues/1319) for related information.
* [BugFix][Enhancement] Modified `nccopy` so that `_NCProperties` is not copied over verbatim but is instead generated based on the version of `libnetcdf` used when copying the file. Additionally, `_NCProperties` are displayed if/when associated with a netcdf3 file, now. See [GitHub #803](https://github.com/Unidata/netcdf-c/issues/803) for more information.
......
config.h.cmake.in
View file @ d272781d
......@@ -367,6 +367,12 @@ are set when opening a binary file on Windows. */
nc4file. */
#cmakedefine HDF5_HAS_H5FREE 1
/* if true, H5allocate_memory() will be used. */
#cmakedefine HDF5_HAS_ALLOCATE_MEMORY 1
/* if true, H5resize_memory() will be used. */
#cmakedefine HDF5_HAS_RESIZE_MEMORY 1
/* if true, hdf5 has parallelism enabled */
#cmakedefine HDF5_PARALLEL 1
......
config.h.in
View file @ d272781d
......@@ -111,6 +111,9 @@
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
/* Define to 1 if you have the `H5allocate_memory' function. */
#undef HAVE_H5ALLOCATE_MEMORY
/* Define to 1 if you have the `H5free_memory' function. */
#undef HAVE_H5FREE_MEMORY
......@@ -126,6 +129,9 @@
/* Define to 1 if you have the `H5Pset_libver_bounds' function. */
#undef HAVE_H5PSET_LIBVER_BOUNDS
/* Define to 1 if you have the `H5resize_memory' function. */
#undef HAVE_H5RESIZE_MEMORY
/* Define to 1 if you have the `H5Z_SZIP' function. */
#undef HAVE_H5Z_SZIP
......@@ -286,6 +292,9 @@
/* Define to 1 if the system has the type `ushort'. */
#undef HAVE_USHORT
/* if true, H5allocate_memory() will be used. */
#undef HDF5_HAS_ALLOCATE_MEMORY
/* if true, use collective metadata ops in parallel netCDF-4 */
#undef HDF5_HAS_COLL_METADATA_OPS
......@@ -296,6 +305,9 @@
/* if true, netcdf4 file properties will be set using H5Pset_libver_bounds */
#undef HDF5_HAS_LIBVER_BOUNDS
/* if true, H5resize_memory() will be used. */
#undef HDF5_HAS_resize_MEMORY
/* if true, hdf5 has parallelism enabled */
#undef HDF5_PARALLEL
......
configure
View file @ d272781d
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for netCDF 4.6.2.1.
# Generated by GNU Autoconf 2.69 for netCDF 4.6.3.
#
# Report bugs to <support-netcdf@unidata.ucar.edu>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='netCDF'
PACKAGE_TARNAME='netcdf-c'
PACKAGE_VERSION='4.6.2.1'
PACKAGE_STRING='netCDF 4.6.2.1'
PACKAGE_VERSION='4.6.3'
PACKAGE_STRING='netCDF 4.6.3'
PACKAGE_BUGREPORT='support-netcdf@unidata.ucar.edu'
PACKAGE_URL=''
 
......@@ -1546,7 +1546,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures netCDF 4.6.2.1 to adapt to many kinds of systems.
\`configure' configures netCDF 4.6.3 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1617,7 +1617,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of netCDF 4.6.2.1:";;
short | recursive ) echo "Configuration of netCDF 4.6.3:";;
esac
cat <<\_ACEOF
 
......@@ -1871,7 +1871,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
netCDF configure 4.6.2.1
netCDF configure 4.6.3
generated by GNU Autoconf 2.69
 
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2580,7 +2580,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by netCDF $as_me 4.6.2.1, which was
It was created by netCDF $as_me 4.6.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
$ $0 $@
......@@ -2938,8 +2938,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
NC_VERSION_MAJOR=4
NC_VERSION_MINOR=6
NC_VERSION_PATCH=2
NC_VERSION_NOTE=".1"
NC_VERSION_PATCH=3
NC_VERSION_NOTE=""
 
#####
# Set some variables used to generate a libnetcdf.settings file,
......@@ -2948,11 +2948,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
# Create the VERSION file, which contains the package version from
# AC_INIT.
echo 4.6.2.1>VERSION
echo 4.6.3>VERSION
 
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: netCDF 4.6.2.1" >&5
$as_echo "$as_me: netCDF 4.6.2.1" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: netCDF 4.6.3" >&5
$as_echo "$as_me: netCDF 4.6.3" >&6;}
 
# Keep libtool macros in an m4 directory.
 
......@@ -3616,7 +3616,7 @@ fi
 
# Define the identity of the package.
PACKAGE='netcdf-c'
VERSION='4.6.2.1'
VERSION='4.6.3'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -18028,7 +18028,7 @@ done
 
# H5Pset_fapl_mpiposix and H5Pget_fapl_mpiposix have been removed since HDF5 1.8.12.
# Use H5Pset_fapl_mpio and H5Pget_fapl_mpio, instead.
for ac_func in H5Pget_fapl_mpio H5Pset_deflate H5Z_SZIP H5free_memory H5Pset_libver_bounds H5Pset_all_coll_metadata_ops
for ac_func in H5Pget_fapl_mpio H5Pset_deflate H5Z_SZIP H5free_memory H5resize_memory H5allocate_memory H5Pset_libver_bounds H5Pset_all_coll_metadata_ops
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
......@@ -18083,6 +18083,18 @@ $as_echo "#define HDF5_HAS_H5FREE 1" >>confdefs.h
 
fi
 
if test "x$ac_cv_func_H5allocate_memory" = xyes; then
$as_echo "#define HDF5_HAS_ALLOCATE_MEMORY 1" >>confdefs.h
fi
if test "x$ac_cv_func_H5resize_memory" = xyes; then
$as_echo "#define HDF5_HAS_resize_MEMORY 1" >>confdefs.h
fi
if test "x$ac_cv_func_H5Pset_libver_bounds" = xyes; then
 
$as_echo "#define HDF5_HAS_LIBVER_BOUNDS 1" >>confdefs.h
......@@ -20184,7 +20196,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by netCDF $as_me 4.6.2.1, which was
This file was extended by netCDF $as_me 4.6.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -20254,7 +20266,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
netCDF config.status 4.6.2.1
netCDF config.status 4.6.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
 
......
configure.ac
View file @ d272781d
......@@ -13,7 +13,7 @@
AC_PREREQ([2.59])
# Initialize with name, version, and support email address.
AC_INIT([netCDF], [4.6.2.1], [support-netcdf@unidata.ucar.edu], [netcdf-c])
AC_INIT([netCDF], [4.6.3], [support-netcdf@unidata.ucar.edu], [netcdf-c])
##
# Prefer an empty CFLAGS variable instead of the default -g -O2.
......@@ -24,8 +24,8 @@ AC_INIT([netCDF], [4.6.2.1], [support-netcdf@unidata.ucar.edu], [netcdf-c])
AC_SUBST([NC_VERSION_MAJOR]) NC_VERSION_MAJOR=4
AC_SUBST([NC_VERSION_MINOR]) NC_VERSION_MINOR=6
AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=2
AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE=".1"
AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=3
AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE=""
#####
# Set some variables used to generate a libnetcdf.settings file,
......@@ -1029,7 +1029,7 @@ if test "x$enable_hdf5" = xyes; then
# H5Pset_fapl_mpiposix and H5Pget_fapl_mpiposix have been removed since HDF5 1.8.12.
# Use H5Pset_fapl_mpio and H5Pget_fapl_mpio, instead.
AC_CHECK_FUNCS([H5Pget_fapl_mpio H5Pset_deflate H5Z_SZIP H5free_memory H5Pset_libver_bounds H5Pset_all_coll_metadata_ops])
AC_CHECK_FUNCS([H5Pget_fapl_mpio H5Pset_deflate H5Z_SZIP H5free_memory H5resize_memory H5allocate_memory H5Pset_libver_bounds H5Pset_all_coll_metadata_ops])
# Check to see if HDF5 library has collective metadata APIs, (HDF5 >= 1.10.0)
if test "x$ac_cv_func_H5Pset_all_coll_metadata_ops" = xyes; then
......@@ -1063,6 +1063,14 @@ if test "x$enable_hdf5" = xyes; then
AC_DEFINE([HDF5_HAS_H5FREE], [1], [if true, H5free_memory() will be used to free hdf5-allocated memory in nc4file.])
fi
if test "x$ac_cv_func_H5allocate_memory" = xyes; then
AC_DEFINE([HDF5_HAS_ALLOCATE_MEMORY], [1], [if true, H5allocate_memory() will be used.])
fi
if test "x$ac_cv_func_H5resize_memory" = xyes; then
AC_DEFINE([HDF5_HAS_resize_MEMORY], [1], [if true, H5resize_memory() will be used.])
fi
if test "x$ac_cv_func_H5Pset_libver_bounds" = xyes; then
AC_DEFINE([HDF5_HAS_LIBVER_BOUNDS], [1], [if true, netcdf4 file properties will be set using H5Pset_libver_bounds])
fi
......
debian/changelog
View file @ d272781d
netcdf (1:4.6.3-1~exp1) experimental; urgency=medium
* New upstream release.
* Add upstream patches to remove build path from binaries.
* Drop unused lintian overrides.
* Refresh patches.
* Drop unused pkg-config-references-unknown-shared-library override.
* Rename library packages for SONAME bump.
* Update reproducible-settings.patch to remove build path.
-- Bas Couwenberg <sebastic@debian.org> Sat, 02 Mar 2019 09:01:59 +0100
netcdf (1:4.6.2.1-1~exp2) experimental; urgency=medium
* Remove arch specific NC_byteswap8 from symbols file.
......
debian/control
View file @ d272781d
......@@ -34,7 +34,7 @@ Description: Documentation for NetCDF
This package contains documentation for the NetCDF library in a
variety of formats.
Package: libnetcdf13
Package: libnetcdf15
Architecture: any
Multi-Arch: same
Section: libs
......@@ -59,7 +59,7 @@ Description: Interface for scientific data access to large binary data
Package: libnetcdf-dev
Architecture: any
Section: libdevel
Depends: libnetcdf13 (= ${binary:Version}),
Depends: libnetcdf15 (= ${binary:Version}),
libhdf5-dev (>= 1.8.6-1~),
libcurl4-gnutls-dev | libcurl-ssl-dev,
${misc:Depends}
......
debian/libnetcdf-dev.lintian-overrides
View file @ d272781d
......@@ -2,6 +2,3 @@
file-references-package-build-path usr/lib/*/cmake/netCDF/netCDFConfig.cmake
file-references-package-build-path usr/lib/*/libnetcdf.settings
# https://github.com/Unidata/netcdf-c/issues/1324
pkg-config-references-unknown-shared-library usr/lib/*/pkgconfig/netcdf.pc *
debian/libnetcdf13.symbols → debian/libnetcdf15.symbols
View file @ d272781d
libnetcdf.so.13 #PACKAGE# #MINVER#
libnetcdf.so.15 #PACKAGE# #MINVER#
* Build-Depends-Package: libnetcdf-dev
Cde2h@Base 4.3.3
Cdh2e@Base 4.3.3
......
debian/netcdf-bin.lintian-overrides deleted 100644 → 0
View file @ 79f81902
# https://github.com/Unidata/netcdf-c/issues/1323
file-references-package-build-path usr/bin/nccopy
file-references-package-build-path usr/bin/ncdump
file-references-package-build-path usr/bin/ncgen
debian/patches/NDEBUG-version-of-macro-NC_CHECK.patch 0 → 100644
View file @ d272781d
Description: provide NDEBUG version of macro NC_CHECK which does not use code file name
Author: Ed Hartnett <edwardjameshartnett@gmail.com>
Origin: https://github.com/Unidata/netcdf-c/pull/1326/commits/8904c5cbc362d38513946136878857184ccdbc27
Bug: https://github.com/Unidata/netcdf-c/issues/1323
---
ncdump/utils.h | 8 ++++++++
1 file changed, 8 insertions(+)
--- a/ncdump/utils.h
+++ b/ncdump/utils.h
@@ -63,7 +63,15 @@ extern char *progname; /* for error mes
extern "C" {
#endif
+/* For NDEBUG builds, provide a version of NC_CHECK that does not
+ * include a file name. Including a file name causes heartache for the
+ * debian package builders. They already use NDEBUG to turn off the
+ * file names in asserts. */
+#ifdef NDEBUG
+#define NC_CHECK(fncall) {int ncstat=fncall;if(ncstat!=NC_NOERR)check(ncstat,"",__LINE__);}
+#else
#define NC_CHECK(fncall) {int ncstat=fncall;if(ncstat!=NC_NOERR)check(ncstat,__FILE__,__LINE__);}
+#endif /* NDEBUG */
/* Print error message to stderr and exit */
extern void error ( const char *fmt, ... );
debian/patches/Remove-all-references-to-__FILE__-in-ncgen.patch 0 → 100644
View file @ d272781d
Description: Remove all references to __FILE__ in ncgen
Replace the uses of the __FILE__ macro in ncgen with the
constant string "ncgen" in order to keep external package
builders (like Debian) happy.
.
Note that __FILE__ will still appear in ncgen generated C code
files, but this should be ok since it is not part of the distro
per-se.
Author: Dennis Heimbigner <dmh@ucar.edu>
Origin: https://github.com/Unidata/netcdf-c/pull/1327/commits/ad3e3bd48e9af4f0f293b71cff1fec787e0b6bc3
Bug: https://github.com/Unidata/netcdf-c/issues/1323
--- a/ncgen/genbin.c
+++ b/ncgen/genbin.c
@@ -60,7 +60,7 @@ genbin_netcdf(void)
#endif
stat = nc_create(filename, cmode_modifier, &ncid);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
/* ncid created above is also root group*/
rootgroup->nc_id = ncid;
@@ -72,7 +72,7 @@ genbin_netcdf(void)
Symbol* gsym = (Symbol*)listget(grpdefs,igrp);
if(gsym == rootgroup) continue; /* ignore root group*/
stat = nc_def_grp(gsym->container->nc_id,gsym->name,&gsym->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
#endif
@@ -95,7 +95,7 @@ genbin_netcdf(void)
dsym->name,
(dsym->dim.isunlimited?NC_UNLIMITED:dsym->dim.declsize),
&dsym->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
}
@@ -122,7 +122,7 @@ genbin_netcdf(void)
NULL,
&vsym->nc_id);
}
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
}
@@ -154,12 +154,12 @@ genbin_netcdf(void)
if (nofill_flag) {
stat = nc_set_fill(rootgroup->nc_id, NC_NOFILL, 0);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
/* leave define mode */
stat = nc_enddef(rootgroup->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
if(!header_only) {
/* Load values into those variables with defined data */
@@ -189,7 +189,7 @@ genbin_defineglobalspecials(void)
/* Watch out, this is a global Attribute */
format = kind_string(/*Main.*/format_flag);
stat = nc_put_att_text(rootgroup->nc_id,NC_GLOBAL,"_Format",strlen(format),format);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
#endif /*0*/
@@ -206,13 +206,13 @@ genbin_definespecialattributes(Symbol* v
derror("NC_CHUNKED requested, but no chunksizes specified");
stat = nc_def_var_chunking(var->container->nc_id, var->nc_id, NC_CHUNKED, special->_ChunkSizes);
}
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
if(special->flags & _FLETCHER32_FLAG) {
stat = nc_def_var_fletcher32(var->container->nc_id,
var->nc_id,
special->_Fletcher32);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
if(special->flags & (_DEFLATE_FLAG | _SHUFFLE_FLAG)) {
stat = nc_def_var_deflate(var->container->nc_id,
@@ -221,7 +221,7 @@ genbin_definespecialattributes(Symbol* v
(special->_DeflateLevel >= 0?1:0),
(special->_DeflateLevel >= 0?special->_DeflateLevel
:0));
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
if(special->flags & _ENDIAN_FLAG) {
stat = nc_def_var_endian(var->container->nc_id,
@@ -229,14 +229,14 @@ genbin_definespecialattributes(Symbol* v
(special->_Endianness == NC_ENDIAN_LITTLE?
NC_ENDIAN_LITTLE
:NC_ENDIAN_BIG));
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
if(special->flags & _NOFILL_FLAG) {
stat = nc_def_var_fill(var->container->nc_id,
var->nc_id,
(special->_Fill?NC_FILL:NC_NOFILL),
NULL);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
if(special->flags & _FILTER_FLAG) {
/* Special check for alternate way to specify _Deflate */
@@ -263,7 +263,7 @@ genbin_definespecialattributes(Symbol* v
special->_FilterParams
);
}
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
return stat;
}
@@ -275,7 +275,7 @@ genbin_close(void)
{
int stat;
stat = nc_close(rootgroup->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
#ifdef USE_NETCDF4
@@ -296,7 +296,7 @@ genbin_deftype(Symbol* tsym)
tsym->typ.size,
tsym->name,
&tsym->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
break;
case NC_ENUM:
{
@@ -305,7 +305,7 @@ genbin_deftype(Symbol* tsym)
tsym->typ.basetype->nc_id,
tsym->name,
&tsym->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
datum = bbNew();
for(i=0;i<listlength(tsym->subnodes);i++) {
Symbol* econst = (Symbol*)listget(tsym->subnodes,i);
@@ -317,7 +317,7 @@ genbin_deftype(Symbol* tsym)
tsym->nc_id,
econst->name,
bbContents(datum));
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
bbFree(datum);
}
@@ -327,14 +327,14 @@ genbin_deftype(Symbol* tsym)
tsym->name,
tsym->typ.basetype->nc_id,
&tsym->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
break;
case NC_COMPOUND:
stat = nc_def_compound(tsym->container->nc_id,
tsym->typ.size,
tsym->name,
&tsym->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
for(i=0;i<listlength(tsym->subnodes);i++) {
Symbol* efield = (Symbol*)listget(tsym->subnodes,i);
ASSERT(efield->subclass == NC_FIELD);
@@ -362,7 +362,7 @@ genbin_deftype(Symbol* tsym)
efield->typ.dimset.ndims,
dimsizes);
}
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
break;
default: panic("definectype: unexpected type subclass");
@@ -448,11 +448,11 @@ genbin_writevar(Generator* generator, Sy
} else {
stat = nc_put_vara(vsym->container->nc_id, vsym->nc_id, start, count, data);
}
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
#if 0
/* Reclaim the data */
stat = ncaux_reclaim_data(vsym->container->nc_id, vsym->typ.basetype->nc_id, data, nelems);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
bbClear(memory); /* reclaim top-level memory */
#endif
return stat;
@@ -481,7 +481,7 @@ genbin_writeattr(Generator* generator, S
case NC_BYTE: {
signed char* data = (signed char*)bbContents(databuf);
stat = nc_put_att_schar(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_CHAR: {
char* data = (char*)bbContents(databuf);
@@ -495,27 +495,27 @@ genbin_writeattr(Generator* generator, S
slen++;
}
stat = nc_put_att_text(grpid,varid,asym->name,slen,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_SHORT: {
short* data = (short*)bbContents(databuf);
stat = nc_put_att_short(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_INT: {
int* data = (int*)bbContents(databuf);
stat = nc_put_att_int(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_FLOAT: {
float* data = (float*)bbContents(databuf);
stat = nc_put_att_float(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_DOUBLE: {
double* data = (double*)bbContents(databuf);
stat = nc_put_att_double(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_STRING: {
const char** data;
@@ -527,27 +527,27 @@ genbin_writeattr(Generator* generator, S
case NC_UBYTE: {
unsigned char* data = (unsigned char*)bbContents(databuf);
stat = nc_put_att_uchar(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_USHORT: {
unsigned short* data = (unsigned short*)bbContents(databuf);
stat = nc_put_att_ushort(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_UINT: {
unsigned int* data = (unsigned int*)bbContents(databuf);
stat = nc_put_att_uint(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_INT64: {
long long* data = (long long*)bbContents(databuf);
stat = nc_put_att_longlong(grpid,varid,asym->name,typid,len,data);
- check_err2(stat,asym->lineno,__LINE__,__FILE__);
+ check_err2(stat,asym->lineno,__LINE__,"ncgen");
} break;
case NC_UINT64: {
unsigned long long* data = (unsigned long long*)bbContents(databuf);
stat = nc_put_att_ulonglong(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
default: PANIC1("genbin_defineattr: unexpected basetype: %d",basetype->typ.typecode);
}
@@ -556,13 +556,13 @@ genbin_writeattr(Generator* generator, S
data = (const char*)bbContents(databuf);
stat = nc_put_att(grpid,varid,asym->name,typid,
len,(void*)data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
#ifdef GENDEBUG
{
char out[4096];
memset(out,0x77,sizeof(out));
stat = nc_get_att(grpid,varid,asym->name,&out);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
#endif
}
--- a/ncgen/nc_iter.c
+++ b/ncgen/nc_iter.c
@@ -14,7 +14,7 @@ It has diverged slightly over time.
#include "nc_iter.h"
-#define CHECK(stat,f) if(stat != NC_NOERR) {check(stat,#f,__FILE__,__LINE__);} else {}
+#define CHECK(stat,f) if(stat != NC_NOERR) {check(stat,#f,"ncgen",__LINE__);} else {}
/* forward declarations */
static int nc_blkio_init(size_t bufsize, size_t value_size, int rank,
debian/patches/hdf5-library-path.patch
View file @ d272781d
......@@ -7,7 +7,7 @@ Forwarded: not-needed
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1834,6 +1834,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
@@ -1836,6 +1836,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
SET(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
SET(CC ${CMAKE_C_COMPILER})
......@@ -40,12 +40,11 @@ Forwarded: not-needed
if [ -z $has_dap2 -o "$has_dap2" = "OFF" ]; then
--- a/netcdf.pc.in
+++ b/netcdf.pc.in
@@ -8,6 +8,6 @@ Name: @PACKAGE@
Description: NetCDF Client Library for C
@@ -9,5 +9,5 @@ Description: NetCDF Client Library for C
URL: http://www.unidata.ucar.edu/netcdf
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} @NC_LIBS@
Libs: -L${libdir} @NC_LIBS@
-Libs.private: @LIBS@
-Cflags: -I${includedir}
+Libs: -L${libdir} @HDF5_LIBS@ @NC_LIBS@
+Libs.private: @LIBS@ @HDF5_LIBS@
+Cflags: -I${includedir} @HDF5_INCS@
debian/patches/reproducible-settings.patch
View file @ d272781d
......@@ -3,12 +3,13 @@ Author: Bas Couwenberg <sebastic@debian.org>
--- a/libnetcdf.settings.in
+++ b/libnetcdf.settings.in
@@ -4,8 +4,6 @@
@@ -4,9 +4,6 @@
# General
-------
NetCDF Version: @PACKAGE_VERSION@
-Configured On: @CONFIG_DATE@
-Host System: @host_cpu@-@host_vendor@-@host_os@
Build Directory: @abs_top_builddir@
-Build Directory: @abs_top_builddir@
Install Prefix: @prefix@
# Compiling Options
debian/patches/series
View file @ d272781d
......@@ -3,3 +3,5 @@ privacy-breach-logo.patch
hdf5-library-path.patch
tst_fileinfo-link-hdf5.patch
reproducible-settings.patch
NDEBUG-version-of-macro-NC_CHECK.patch
Remove-all-references-to-__FILE__-in-ncgen.patch