diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2020-07-07 21:28:10 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2020-07-07 21:28:10 (GMT) |
commit | 56a4cd641a94da36a550e4b4db9879945e7b4c47 (patch) | |
tree | 63a6d13d258e1274b5e9a218060187768f4da8c1 | |
parent | 0cff7d03f8b8f7889be71ac2115b2835f3cd26d2 (diff) | |
parent | c0702f601eb4e0b4116a7ed02999746c20420cad (diff) | |
download | hdf5-56a4cd641a94da36a550e4b4db9879945e7b4c47.zip hdf5-56a4cd641a94da36a550e4b4db9879945e7b4c47.tar.gz hdf5-56a4cd641a94da36a550e4b4db9879945e7b4c47.tar.bz2 |
Merge pull request #2679 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'c0702f601eb4e0b4116a7ed02999746c20420cad':
Change load path in libhdf5_java.dylib to unversioned libhdf5.dylib for junit tests on Macs.
Merge pull request #2667 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
Merge pull request #2670 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
-rw-r--r-- | configure.ac | 7 | ||||
-rw-r--r-- | java/test/junit.sh.in | 16 | ||||
-rw-r--r-- | release_docs/RELEASE.txt | 8 |
3 files changed, 21 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 74dd933..632906f 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 125ea46..a074e30 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -15,12 +15,12 @@ top_builddir=@top_builddir@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ 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 @@ -43,8 +43,8 @@ myos=`uname -s` # where the libs exist HDFLIB_HOME="$top_srcdir/java/lib" -BLDLIBDIR="$prefix/lib" BLDDIR="." +BLDLIBDIR="$BLDDIR/testlibs" HDFTEST_HOME="$top_srcdir/java/test" JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar TESTJARFILE=jar@PACKAGE_TARNAME@test.jar @@ -145,6 +145,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.dylib libhdf5_java.dylib) + fi # copy jar files. Used -f to make sure get a new copy for tstfile in $COPY_JARTESTFILES do @@ -203,10 +210,7 @@ CLEAN_LIBFILES_AND_BLDLIBDIR() INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` INODE_DDIR=`$LS -i -d $BLDLIBDIR | $AWK -F' ' '{print $1}'` if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then - for tstfile in $COPY_JARTESTFILES - do - $RM $BLDLIBDIR/tstfile - done + $RM -rf $BLDLIBDIR fi } diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 85359cd..72b5942 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -542,7 +542,13 @@ Bug Fixes since HDF5-1.10.5 release 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 |