Skip to content

Commit d9badc7

Browse files
committed
correct double -lhdf5 in config
resign the lib in case of remove rpath add .f90 prefiex if load.link.in ( ff-c++ command)
1 parent 6c62f96 commit d9badc7

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

bin/rm_double_rpath_dylib

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
#!/bin/sh
22
lr=`otool -l $1 | awk '/cmd LC_RPATH/,/path/ { if ($1 ~ /path/) print $2}'| sort | awk ' /\// { if($1==aa) {print aa}; aa=$1}' `
33
echo $lr
4+
nlc=`echo $lr| wc -w`
5+
if [ $nlc -gt 0 ]; then
46
for i in $lr ; do
57
install_name_tool $1 -delete_rpath $i
68
done
7-
otool -l $1 | awk '/cmd LC_RPATH/,/path/ { if ($1 ~ /path/) print $2}'| sort
9+
# resigne the code ...
10+
codesign --remove-signature $1
11+
codesign -s - $1
12+
13+
fi
14+
echo " double rpath ??? "
15+
otool -l $1 | awk '/cmd LC_RPATH/,/path/ { if ($1 ~ /path/) print $2}'| sort | awk ' /\// { if($1==aa) {print aa}; aa=$1}'

etc/config/m4/ax_lib_hdf5.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,8 @@ HDF5 support is being disabled (equivalent to --with-hdf5=no).
237237
esac
238238
done
239239
240-
HDF5_LIBS="-lhdf5 $HDF5_LIBS"
240+
# HDF5_LIBS="-lhdf5 $HDF5_LIBS"
241+
# remove double -lhdf5
241242
AC_MSG_RESULT([yes (version $[HDF5_VERSION])])
242243
243244
dnl See if we can compile

plugin/seq/load.link.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ while [ $# -ne 0 ] ; do
150150
*.cxx) files="$files '$1'"; o=`basename "$1" .cxx` ; fileso="$fileso '$o.o'"; args=$argsp;;
151151
*.c) files="$files '$1'"; o=`basename "$1" .c` ; fileso="$fileso '$o.o'"; args=$argsp;;
152152
*.f) ffiles="$ffiles '$1'"; o=`basename "$1" .f` ; fileso="$fileso '$o.o'";;
153+
*.f90) ffiles="$ffiles '$1'"; o=`basename "$1" .f90` ; fileso="$fileso '$o.o'";;
153154
*.F) ffiles="$ffiles '$1'"; o=`basename "$1" .F` ; fileso="$fileso '$o.o'";;
154155
*.o) fileso="$fileso '$1'"; o=`basename "$1" .o` ;;
155156
-o) out="$2"; shift;;

0 commit comments

Comments
 (0)