Commit 8d7a4bd5 authored by Guillaume Pasero's avatar Guillaume Pasero

Revert "BUG: fix find files in pkgsetup (linux,osx) #1672"

This reverts commit 3001945a.
parent 3001945a
......@@ -52,9 +52,7 @@ fi
unset LD_LIBRARY_PATH
# we remove files in $OUT_DIR/lib/gtk which we CANNOT add new rpath
#RK: We cannot avoid -maxdepth 1 option in find command below and must list search directories
#search inside plugins/* and python* directories is what we need here.
BINARY_FILES=$(find "$OUT_DIR/bin" "$OUT_DIR/lib" "$OUT_DIR/lib/otb/applications" $OUT_DIR/lib/python* $OUT_DIR/plugins/* -maxdepth 1 -type f -exec file {} \; | grep -i elf|cut -f1 -d':')
BINARY_FILES=$(find "$OUT_DIR/lib" "$OUT_DIR/bin" "$OUT_DIR/plugins" -type f -exec file {} \; | grep -v '/lib/gtk/' | grep -i elf|cut -f1 -d':')
# run patchelf
for bin_file in $BINARY_FILES; do
#echo "adding rpath to $bin_file"
......
......@@ -51,8 +51,8 @@ unset DYLD_FALLBACK_LIBRARY_PATH
echo "Configuring..."
LIB_FILES=$(find "$OUT_DIR/lib" "$OUT_DIR/lib/otb/applications" $OUT_DIR/lib/python* $OUT_DIR/plugins/* -maxdepth 1 -type f -exec file {} \; | grep -i "Mach-O"|cut -d ':' -f1)
BIN_FILES=$(find "$OUT_DIR/bin" -maxdepth 1 -type f -exec file {} \; | grep -i "Mach-O*.*executable"|cut -d ':' -f1)
LIB_FILES=$(find "$OUT_DIR/lib" "$OUT_DIR/plugins" -type f -exec file {} \; | grep -i "Mach-O"|cut -d ':' -f1)
BIN_FILES=$(find "$OUT_DIR/bin" -type f -exec file {} \; | grep -i "Mach-O*.*executable"|cut -d ':' -f1)
# run install_name_tool
for input_file in $LIB_FILES $BIN_FILES; do
#echo "adding rpath to $OUT_DIR/$lib_file"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment