mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-05 15:42:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r23433] Fix for HDFFV-7996.

Browse Source 
Compile scripts will add paths for external libraries linked to executable files that they create.
Eliminates need for LD_LIBRARY_PATH for szip in locations not known to ld.

Teted on platypus and emu (64bit) in addition to h5committest.
This commit is contained in:
Larry Knox 2013-03-22 16:56:15 -05:00
parent 99b1524474
commit f593b6e712
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
c++/src/h5c++.in
View File

@ -334,6 +334,20 @@ if test "x$do_link" = "xyes"; then
if test -n "$flag"; then
shared_link="${flag}${libdir}"
# Any libraries in LDFLAGS or H5BLD_LDFLAGS also should have rpaths embedded
# in the executables created by h5cc (reduces need for LD_LIBRARY_PATH).
if test -n "$LDFLAGS"; then
for entry in $LDFLAGS; do
extdir=`echo $entry | sed '/^-L/ s/^-L//'`
shared_link="${shared_link} ${flag}${extdir}"
done
fi
if test -n "$H5BLD_LDFLAGS"; then
for entry in $H5BLD_LDFLAGS; do
extdir=`echo $entry | sed '/^-L/ s/^-L//'`
shared_link="${shared_link} ${flag}${extdir}"
done
fi
fi
if test "x$USE_SHARED_LIB" != "xyes"; then

14
fortran/src/h5fc.in
View File

@ -316,6 +316,20 @@ if test "x$do_link" = "xyes"; then
if test -n "$flag"; then
shared_link="${flag}${libdir}"
# Any libraries in LDFLAGS or H5BLD_LDFLAGS also should have rpaths embedded
# in the executables created by h5cc (reduces need for LD_LIBRARY_PATH).
if test -n "$LDFLAGS"; then
for entry in $LDFLAGS; do
extdir=`echo $entry | sed '/^-L/ s/^-L//'`
shared_link="${shared_link} ${flag}${extdir}"
done
fi
if test -n "$H5BLD_LDFLAGS"; then
for entry in $H5BLD_LDFLAGS; do
extdir=`echo $entry | sed '/^-L/ s/^-L//'`
shared_link="${shared_link} ${flag}${extdir}"
done
fi
fi
if test "x$USE_SHARED_LIB" != "xyes"; then

14
tools/misc/h5cc.in
View File

@ -350,6 +350,20 @@ if test "x$do_link" = "xyes"; then
if test -n "$flag"; then
shared_link="${flag}${libdir}"
# Any libraries in LDFLAGS or H5BLD_LDFLAGS also should have rpaths embedded
# in the executables created by h5cc (reduces need for LD_LIBRARY_PATH).
if test -n "$LDFLAGS"; then
for entry in $LDFLAGS; do
extdir=`echo $entry | sed '/^-L/ s/^-L//'`
shared_link="${shared_link} ${flag}${extdir}"
done
fi
if test -n "$H5BLD_LDFLAGS"; then
for entry in $H5BLD_LDFLAGS; do
extdir=`echo $entry | sed '/^-L/ s/^-L//'`
shared_link="${shared_link} ${flag}${extdir}"
done
fi
fi
if test "x$USE_SHARED_LIB" != "xyes"; then