From 9c0cc531755b45859c88f12e661076a9e4310def Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 4 Jul 2017 01:34:23 +0900 Subject: Mac package build: remove obsolete hack And also add some additional comments. Signed-off-by: Dirk Hohndel --- packaging/macosx/make-package.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'packaging/macosx') diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh index 6ff1d4cf0..46ca5b599 100755 --- a/packaging/macosx/make-package.sh +++ b/packaging/macosx/make-package.sh @@ -37,10 +37,14 @@ for i in libssh libssrfmarblewidget libgit2 libGrantlee_TextDocument.dylib libGr fi fi done + +# next, replace @rpath references with @executable_path references in Subsurface RPATH=$(otool -L ${EXECUTABLE} | grep rpath | cut -d\ -f1 | tr -d "\t" | cut -b 8- ) for i in ${RPATH}; do install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${EXECUTABLE} done + +# and now replace @rpath references in libssrfmarblewidget MARBLELIB=$(ls Subsurface.app/Contents/Frameworks/libssrfmarblewidget*dylib) RPATH=$(otool -L ${MARBLELIB} | grep rpath | cut -d\ -f1 | tr -d "\t" | cut -b 8- ) for i in ${RPATH}; do @@ -59,7 +63,7 @@ done # # -disabled for now as this is still under more investigation- # cp -a /Users/hohndel/src/tmp/Subsurface.app/Contents Subsurface.app/ -cp ${DIR}/tmp/Subsurface.app/Contents/Frameworks/lib{sql,usb,zip}* Subsurface.app/Contents/Frameworks +#cp ${DIR}/tmp/Subsurface.app/Contents/Frameworks/lib{sql,usb,zip}* Subsurface.app/Contents/Frameworks # clean up shared library dependency in the Grantlee plugins for i in Subsurface.app/Contents/PlugIns/grantlee/5.0/*.so; do -- cgit v1.2.3-70-g09d2