From 30abf02de229e606f4ba05afa00ca313f51e7a1a Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Fri, 4 Jan 2019 07:26:15 -0600 Subject: Add symlinks named libhdf5_hl_fortran* to libhdf5hl_fortran in Makefile.am to match cmake install and the name pattern for other hl lib files. Add missing ';' to test/dsets.c line 13075. --- hl/fortran/src/Makefile.am | 13 +++++++++++++ test/dsets.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am index a495e220..a9beb20 100644 --- a/hl/fortran/src/Makefile.am +++ b/hl/fortran/src/Makefile.am @@ -50,6 +50,19 @@ libhdf5hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \ # HDF5 HL Fortran library depends on HDF5 Library. libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F) +# The name of the lib file doesn't follow the same pattern as the other hl lib +# files, namely libhdf5_hl_*. Add a symlink with the compliant name to the +# actual lib file. +install-exec-hook: + cd $(DESTDIR)$(libdir) && \ + if test -f libhdf5hl_fortran.a; then \ + $(LN_S) libhdf5hl_fortran.a libhdf5_hl_fortran.a; \ + fi; \ + if test -f libhdf5hl_fortran.so; then \ + $(LN_S) libhdf5hl_fortran.so libhdf5_hl_fortran.so; \ + fi; + + # Fortran module files can have different extensions and different names # (e.g., different capitalizations) on different platforms. Write rules # for them explicitly rather than trying to teach automake about them. diff --git a/test/dsets.c b/test/dsets.c index 2c012c7..544d0e2 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -13072,7 +13072,7 @@ test_object_header_minimization_dcpl(void) /*********/ if(NULL == h5_fixname(OHMIN_FILENAME_A, H5P_DEFAULT, filename, sizeof(filename))) - TEST_ERROR("unable to prepare filename") + TEST_ERROR("unable to prepare filename"); file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (0 > file_id) -- cgit v0.12 From cc0421291e0160ba475c74bea4c28b6872ceb03d Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Fri, 4 Jan 2019 08:50:10 -0600 Subject: Uninstall should remove the libhdf5_hl_fortran links. --- hl/fortran/src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am index a9beb20..200a2ce 100644 --- a/hl/fortran/src/Makefile.am +++ b/hl/fortran/src/Makefile.am @@ -85,6 +85,7 @@ uninstall-local: set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ fi; \ fi + $(RM) $(DESTDIR)$(libdir)/libhdf5_hl_fortran* # These are the helper programs we need to build. noinst_PROGRAMS = H5HL_buildiface -- cgit v0.12 From 482d95c8f948599b424443adb42c038703794e72 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Fri, 4 Jan 2019 09:34:18 -0600 Subject: Add RELEASE.txt entry for HDFFV-10596. --- release_docs/RELEASE.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 2f44541..ff18e71 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -327,6 +327,15 @@ Bug Fixes since HDF5-1.10.3 release Fortran -------- + - Added symbolic links libhdf5_hl_fortran.so to libhdf5hl_fortran.so and + libhdf5_hl_fortran.a to libhdf5hl_fortran.a in hdf5/lib directory for + autotools installs. These were added to match the name of the files + installed by cmake and the general pattern of hl lib files. We will + change the names of the installed lib files to the matching name in + the next major release. + + (LRK - 2019/01/04, HDFFV-10596) + - Made Fortran specific subroutines PRIVATE in generic procedures. Effected generic procedures were functions in H5A, H5D, H5P, H5R and H5T. -- cgit v0.12