From c3f179a379deba3a6323bb746842ebdffcfbde18 Mon Sep 17 00:00:00 2001 From: manongjohn <19245851+manongjohn@users.noreply.github.com> Date: Thu, 13 Apr 2023 13:35:41 -0400 Subject: [PATCH] Fix rpath in macOS packaged libraries --- ci-scripts/osx/tahoma-buildpkg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-scripts/osx/tahoma-buildpkg.sh b/ci-scripts/osx/tahoma-buildpkg.sh index e3f39134..a2d452c2 100755 --- a/ci-scripts/osx/tahoma-buildpkg.sh +++ b/ci-scripts/osx/tahoma-buildpkg.sh @@ -81,10 +81,10 @@ $QTDIR/bin/macdeployqt $TOONZDIR/Tahoma2D.app -verbose=0 -always-overwrite \ -executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tfarmserver echo ">>> Correcting library paths" -for X in `find $TOONZDIR/Tahoma2D.app/Contents -type f '(' -name *.dylib -o -name *.so ')' -exec otool -l {} \; | grep -e "^toonz" -e"name \/usr\/local" | sed -e"s/://" -e"s/ (.*$//" -e"s/^ *name //"` +for X in `find $TOONZDIR/Tahoma2D.app/Contents -type f '(' -name *.dylib -o -name *.so ')' -exec otool -l {} \; | grep -e "^toonz" -e"name \/usr\/local" -e"@rpath" | sed -e"s/://" -e"s/ (.*$//" -e"s/^ *name //"` do Z=`echo $X | cut -c 1-1` - if [ "$Z" != "/" ] + if [ "$Z" != "/" -a "$Z" != "@" ] then LIBFILE=$X else