diff options
| author | Eric Bavier <bavier@member.fsf.org> | 2016-11-30 21:26:01 -0600 |
|---|---|---|
| committer | Eric Bavier <bavier@member.fsf.org> | 2016-12-01 23:50:09 -0600 |
| commit | a4b0bfb1952a33b04cf2f2282633e7b342c16fb8 (patch) | |
| tree | 6c0dfc095a29e8db23352a0028bd23906f0c9d10 /gnu/packages/patches/netcdf-config-date.patch | |
| parent | b45baef15678b25c1ec910233db6045dbb15e264 (diff) | |
gnu: netcdf: Upgrade to 4.4.1.1.
* gnu/packages/maths.scm (netcdf, netcdf-parallel-openmpi): Upgrade to
4.4.1.1.
[source]: Adjust patch name, add netcdf-tst_h_par.patch
* gnu/packages/patches/netcdf-config.date.patch: Rename to...
* gnu/packages/patches/netcdf-date-time.patch: ...this. Adjust for
latest source.
* gnu/packages/patches/netcdf-tst_h_par.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Adjust patches.
Diffstat (limited to 'gnu/packages/patches/netcdf-config-date.patch')
| -rw-r--r-- | gnu/packages/patches/netcdf-config-date.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/gnu/packages/patches/netcdf-config-date.patch b/gnu/packages/patches/netcdf-config-date.patch deleted file mode 100644 index 5054612e95..0000000000 --- a/gnu/packages/patches/netcdf-config-date.patch +++ /dev/null @@ -1,47 +0,0 @@ -Honor SOURCE_DATE_EPOCH when exporting configuration date. -Autoconf-level patch submitted upstream on Fri Apr 15 23:07:42 UTC 2016 - ---- a/configure -+++ b/configure -@@ -2866,7 +2866,17 @@ - - - # Configuration Date -- CONFIG_DATE="`date`" -+ CONFIG_DATE="`date -u`" -+if test -n "$SOURCE_DATE_EPOCH"; then -+ CONFIG_DATE=`date -u -d "@$SOURCE_DATE_EPOCH" 2>/dev/null \ -+ || date -u -r "$SOURCE_DATE_EPOCH" 2>/dev/null` -+ if test -z "$CONFIG_DATE"; then -+ as_fn_error $? "malformed SOURCE_DATE_EPOCH" "$LINENO" 5 -+ fi -+fi -+cat >>confdefs.h <<_ACEOF -+#define CONFIG_DATE "$CONFIG_DATE" -+_ACEOF - - # Find out about the host we're building on. - ac_aux_dir= ---- a/libdispatch/derror.c -+++ b/libdispatch/derror.c -@@ -13,7 +13,7 @@ - #endif - - /* Tell the user the version of netCDF. */ --static const char nc_libvers[] = PACKAGE_VERSION " of "__DATE__" "__TIME__" $"; -+static const char nc_libvers[] = PACKAGE_VERSION " of "CONFIG_DATE" $"; - - /** - \defgroup lib_version Library Version ---- a/config.h.in -+++ b/config.h.in -@@ -393,6 +393,9 @@ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -+/* Define to the configuration date */ -+#undef CONFIG_DATE -+ - /* The size of `double', as computed by sizeof. */ - #undef SIZEOF_DOUBLE - |