From b92dcf3a6535fc14a6fdc7afb290eb16f1ec8b38 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Sun, 10 Jan 2021 20:30:12 -0600 Subject: Stat st blocks fix 18 (#250) * close #195. (#196) * Update HDF5PluginMacros.cmake * Update HDF5PluginMacros.cmake * Restores maintainer mode in the autotools (#200) Maintainer mode should be enabled in development branches. Also adds helpful commenting. Add script bin/switch_maint_mode. Add file changes generated by bin reconfigure in src/H5Edefin.h src/H5Einit.h src/H5Epubgen.h src/H5Eterm.h * Update MANIFEST for switch_maint_mode. * Update so numbers to match 1.8.22 release. * Fixes Autotools detection of the st_blocks field in stat (#246) * Fixes Autotools detection of the st_blocks field in stat The Autotools and CMake will now both correctly determine if the stat struct has the st_blocks field and set H5_HAVE_STAT_ST_BLOCKS appropriately. * Fixes a typo in configure.ac Co-authored-by: H. Joe Lee Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com> --- configure.ac | 4 ++-- release_docs/RELEASE.txt | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 3464d0a..72c4333 100644 --- a/configure.ac +++ b/configure.ac @@ -1685,10 +1685,10 @@ esac ## ---------------------------------------------------------------------- -## Does the struct stat have the st_blocks field? This field is not Posix. +## Does the struct stat have the st_blocks field? This field is not POSIX. ## AC_MSG_CHECKING([for st_blocks in struct stat]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM[[ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include ]],[[struct stat sb; sb.st_blocks=0;]])], [AC_DEFINE([HAVE_STAT_ST_BLOCKS], [1], [Define if struct stat has the st_blocks field]) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index f8a422f..2ea9e73 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -398,6 +398,17 @@ Bug Fixes since HDF5-1.8.21 (ADB - 2019/08/12, HDFFV-10879) + - Fixes Autotools determination of the stat struct having an st_blocks field + + A missing parenthesis in an autoconf macro prevented building the test + code used to determine if the stat struct contains the st_blocks field. + Now that the test functions correctly, the H5_HAVE_STAT_ST_BLOCKS #define + found in H5pubconf.h will be defined correctly on both the Autotools and + CMake. This #define is only used in the tests and does not affect the + HDF5 C library. + + (DER - 2021/07/01, HDFFV-11201) + Library ------- @@ -487,11 +498,6 @@ Bug Fixes since HDF5-1.8.21 (DER - 2019/09/17, HDFFV-10893) - Parallel Library - ---------------- - - None - - Performance ------------- - None -- cgit v0.12