Fix scrupting issues.

This commit is contained in:
David Dawes
2018-06-16 11:43:17 -07:00
parent c444a898ec
commit 238baa0995

View File

@@ -9,7 +9,7 @@ do
DYLIBS=`otool -L src/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'` DYLIBS=`otool -L src/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'`
echo "copying $DYLIBS to $KMD_DIR" echo "copying $DYLIBS to $KMD_DIR"
# copy the dylibs to the srcdir # copy the dylibs to the srcdir
for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; allibs+=dylib; done for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; allibs+=($dylib); done
done done
libraries=("libgcc_s.1.dylib" "libgomp.1.dylib" "libidn2.0.dylib" "libstdc++.6.dylib") libraries=("libgcc_s.1.dylib" "libgomp.1.dylib" "libidn2.0.dylib" "libstdc++.6.dylib")
@@ -22,7 +22,7 @@ do
DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'` DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'`
echo "copying indirect $DYLIBS to $KMD_DIR" echo "copying indirect $DYLIBS to $KMD_DIR"
# copy the dylibs to the srcdir # copy the dylibs to the srcdir
for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; allibs+=dylib; done for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; allibs+=($dylib); done
done done
indirectlibraries=("libintl.8.dylib" "libunistring.2.dylib") indirectlibraries=("libintl.8.dylib" "libunistring.2.dylib")
@@ -35,14 +35,18 @@ do
DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'` DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'`
echo "copying $DYLIBS to $KMD_DIR" echo "copying $DYLIBS to $KMD_DIR"
# copy the dylibs to the srcdir # copy the dylibs to the srcdir
for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; allibs+=dylib; done for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; allibs+=($dylib); done
done done
for binary in "${binaries[@]}"; for binary in "${binaries[@]}";
do do
# modify komodod to point to dylibs # modify komodod to point to dylibs
echo "modifying $binary to use local libraries" echo "modifying $binary to use local libraries"
for dylib in "${allibs[@]}"; do install_name_tool -change $dylib @executable_path/`basename $dylib` $KMD_DIR/$binary; done; for dylib in "${allibs[@]}";
do
echo "Next lib is $dylib "
install_name_tool -change $dylib @executable_path/`basename $dylib` $KMD_DIR/$binary;
done;
chmod +x $KMD_DIR/$binary chmod +x $KMD_DIR/$binary
done done