mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-21 01:04:10 +08:00
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
This commit is contained in:
parent
d05b58b5d4
commit
fc69de0e8a
@ -1150,10 +1150,13 @@ AC_CHECK_HEADERS([stdbool.h])
|
||||
AC_CHECK_HEADERS([netdb.h netinet/in.h arpa/inet.h])
|
||||
|
||||
## Darwin
|
||||
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
|
||||
|
@ -20,6 +20,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
|
||||
@ -145,6 +146,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
|
||||
|
@ -1013,6 +1013,14 @@ Bug Fixes since HDF5-1.10.3 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)
|
||||
|
||||
- Fixed a test failure in testpar/t_dset.c caused by
|
||||
the test trying to use the parallel filters feature
|
||||
on MPI-2 implementations.
|
||||
|
Loading…
Reference in New Issue
Block a user