On 10/30/2014 10:10 PM, Marco Atzeri wrote:
On 10/30/2014 8:47 PM, Allen Byrne wrote:
No in the library. The search process for a dynamic library in the "not"
windows section was written with *.so as the pattern.
Allen
ok, found it
adjusting for the right assumptions:
------------------------------------------------------------------------------
The attached patch correct the assumption and the test.
There is still missing point;
libdynlib1.la libdynlib2.la libdynlib3.la should be declared noinst
to avoid their installation
--- origsrc/hdf5-1.8.14-pre1/src/H5PL.c 2014-10-29 18:13:19.000000000 +0100
+++ src/hdf5-1.8.14-pre1/src/H5PL.c 2014-10-30 21:44:42.898097700 +0100
@@ -406,8 +406,14 @@ H5PL__find(H5PL_type_t plugin_type, int
/* The library we are looking for should be called libxxx.so... on
Unix
* or libxxx.xxx.dylib on Mac.
*/
+#ifndef __CYGWIN__
if(!HDstrncmp(dp->d_name, "lib", (size_t)3) &&
(HDstrstr(dp->d_name, ".so") || HDstrstr(dp->d_name,
".dylib"))) {
+#else
+ if(!HDstrncmp(dp->d_name, "cyg", (size_t)3) &&
+ HDstrstr(dp->d_name, ".dll") ) {
+
+#endif
h5_stat_t my_stat;
size_t pathname_len;
htri_t found_in_dir;
--- origsrc/hdf5-1.8.14-pre1/test/test_plugin.sh.in 2014-10-29
18:13:36.000000000 +0100
+++ src/hdf5-1.8.14-pre1/test/test_plugin.sh.in 2014-10-30 23:52:24.578308100
+0100
@@ -28,8 +28,17 @@ exit_code=$EXIT_SUCCESS
TEST_NAME=plugin
TEST_BIN=`pwd`/$TEST_NAME
FROM_DIR=`pwd`/.libs
-PLUGIN_LIB1="$FROM_DIR/libdynlib1.* $FROM_DIR/libdynlib3.*"
-PLUGIN_LIB2="$FROM_DIR/libdynlib2.*"
+case $(uname) in
+ CYGWIN* )
+ PLUGIN_LIB1="$FROM_DIR/cygdynlib1* $FROM_DIR/cygdynlib3*"
+ PLUGIN_LIB2="$FROM_DIR/cygdynlib2*"
+ ;;
+ *)
+ PLUGIN_LIB1="$FROM_DIR/libdynlib1.* $FROM_DIR/libdynlib3.*"
+ PLUGIN_LIB2="$FROM_DIR/libdynlib2.*"
+ ::
+esac
+
PLUGIN_LIBDIR1=testdir1
PLUGIN_LIBDIR2=testdir2
CP="cp -p" # Use -p to preserve mode,ownership,timestamps
_______________________________________________
Hdf-forum is for HDF software users discussion.
[email protected]
http://mail.lists.hdfgroup.org/mailman/listinfo/hdf-forum_lists.hdfgroup.org
Twitter: https://twitter.com/hdf5
