From 8171ef3c887f0870a6bbfd0b5b2376cfbef00bc9 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Thu, 2 Jul 2020 14:14:53 -0500 Subject: Merge pull request #2670 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop * commit 'fc69de0e8ae30e80c1c3c542b156226a75444525': Lib files needed are now copied to a subdirectory in the java/test directory, and on Macs the loader path for libhdf5.xxxs.so is changed in the temporary copy of libhdf5_java.dylib. Fix for HDFFV-11063 --- configure.ac | 7 ++++--- java/test/junit.sh.in | 8 ++++++++ release_docs/RELEASE.txt | 9 +++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 8585f5c..4a610d5 100644 --- a/configure.ac +++ b/configure.ac @@ -1149,12 +1149,13 @@ AC_CHECK_HEADERS([stdint.h], [C9x=yes]) AC_CHECK_HEADERS([stdbool.h]) ## Darwin -AC_CHECK_HEADERS([mach/mach_time.h]) -## Also need to detect Darwin for pubconf +AC_SUBST([H5_IS_DARWIN]) +H5_IS_DARWIN="no" case $host_os in darwin*) AC_DEFINE([HAVE_DARWIN], [1], [Define if Darwin or Mac OS X]) - ;; + H5_IS_DARWIN="yes" + ;; esac ## Windows diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index 598b3d2..3fee3cc 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -21,6 +21,7 @@ USE_FILTER_SZIP="@USE_FILTER_SZIP@" USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@" USE_ROS3_VFD="@HAVE_ROS3_VFD@" USE_HDFS_VFD="@HAVE_LIBHDFS@" +IS_DARWIN="@H5_IS_DARWIN@" TESTNAME=JUnitInterface EXIT_SUCCESS=0 @@ -146,6 +147,13 @@ COPY_LIBFILES_TO_BLDLIBDIR() fi fi done + if [ "$IS_DARWIN" = "yes" ]; then + (cd testlibs; \ + install_name_tool -add_rpath @loader_path libhdf5_java.dylib; \ + exist_path=` otool -l libhdf5_java.dylib | grep libhdf5 | grep -v java | awk '{print $2}'`; \ + echo $exist_path; \ + install_name_tool -change $exist_path @rpath/libhdf5.1000.dylib libhdf5_java.dylib) + fi # copy jar files. Used -f to make sure get a new copy for tstfile in $COPY_JARTESTFILES do diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index cd83b63..f56c7ac 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -160,6 +160,15 @@ Bug Fixes since HDF5-1.12.0 release (QAK - 2020/06/05) + Testing + ------- + - Stopped java/test/junit.sh.in installing libs for testing under ${prefix} + + Lib files needed are now copied to a subdirectory in the java/test + directory, and on Macs the loader path for libhdf5.xxxs.so is changed + in the temporary copy of libhdf5_java.dylib. + + (LRK, 2020/7/2, HDFFV-11063) Supported Platforms -- cgit v0.12