diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-06-02 13:00:18 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-06-02 13:00:18 +0200 |
| commit | 51afc1eb8ebc101ced5874eeadd73d5dfb8612bb (patch) | |
| tree | 0f85822e97b9b1fb63a8792c2b9b85ab982270b1 /tools | |
| parent | e89721bce16d6486e47b5b88d24467face5a11aa (diff) | |
| parent | 8c9831108a2aa591908b9548dec911dbefa4fffb (diff) | |
Merge remote-tracking branch 'origin/1.6'
Conflicts:
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
Change-Id: I32a2a17b8fd7dc0f1f9c12272fc5f814ea5d86cb
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/binarycreator/resources/copylibsintobundle.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/binarycreator/resources/copylibsintobundle.sh b/tools/binarycreator/resources/copylibsintobundle.sh index 3fd562dce..23484ef4a 100644 --- a/tools/binarycreator/resources/copylibsintobundle.sh +++ b/tools/binarycreator/resources/copylibsintobundle.sh @@ -58,7 +58,7 @@ function handleFile() local BUNDLE=$2 # all dynamic libs directly needed by the bundle, which are not in /System/Library or in /usr/lib (which are system default libs, which we don't want) - local LIBS=`otool -L $FILE | grep -v 'executable_path' | grep -v '/System/Library' | grep -v '/usr/lib' | grep '/' | sed -ne 's,^ *\(.*\) (.*,\1,p'` + local LIBS=`xcrun otool -L $FILE | grep -v 'executable_path' | grep -v '/System/Library' | grep -v '/usr/lib' | grep '/' | sed -ne 's,^ *\(.*\) (.*,\1,p'` local lib for lib in $LIBS; do @@ -111,7 +111,7 @@ function handleFile() handleFile "$BUNDLE/Contents/Frameworks/$NEWFRAMEWORKPATH" "$BUNDLE" fi # and inform the dynamic linker about this - install_name_tool -change $lib @executable_path/../Frameworks/$NEWFRAMEWORKPATH $FILE + xcrun install_name_tool -change $lib @executable_path/../Frameworks/$NEWFRAMEWORKPATH $FILE # this part handles 'normal' dynamic libraries (.dylib) @@ -137,7 +137,7 @@ function handleFile() fi # and inform the dynamic linker about this - install_name_tool -change $lib @executable_path/../Frameworks/$NAME $FILE + xcrun install_name_tool -change $lib @executable_path/../Frameworks/$NAME $FILE fi fi @@ -163,13 +163,13 @@ function handleQtPlugins() if echo $plugin | grep 'debug' >/dev/null; then #if [ $IS_DEBUG -eq 1 ]; then cp "$PLUGINPATH/$CLASS/$plugin" $BUNDLE/Contents/plugins/$CLASS - install_name_tool -change $plugin @executable_path/../plugins/$CLASS/$plugin $EXECUTABLE + xcrun install_name_tool -change $plugin @executable_path/../plugins/$CLASS/$plugin $EXECUTABLE handleFile $BUNDLE/Contents/plugins/$CLASS/$plugin $BUNDLE #fi else #if [ $IS_DEBUG -eq 0 ]; then cp "$PLUGINPATH/$CLASS/$plugin" $BUNDLE/Contents/plugins/$CLASS - install_name_tool -change $plugin @executable_path/../plugins/$CLASS/$plugin $EXECUTABLE + xcrun install_name_tool -change $plugin @executable_path/../plugins/$CLASS/$plugin $EXECUTABLE handleFile $BUNDLE/Contents/plugins/$CLASS/$plugin $BUNDLE #fi fi |