diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-12-21 09:25:24 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-12-21 17:33:14 +0000 |
| commit | a1ef5f6899afafe650b9013a8d36613b614b1f3f (patch) | |
| tree | bff44a7a5eeb24c006de2ed45ad48a10b16c8ce8 /packaging/macosx/osx-app.sh.in | |
| parent | ca1d13d4070929eff5f3490d755fc112e875fb8d (diff) | |
macOS: Make sure we package our own libraries.
As of 25e1e2c848 we no longer set LIBRARY_OUTPUT_DIRECTORY to
Wireshark.app/Contents/Frameworks. As a result we need to copy them into
place during our packaging process.
Change-Id: Idbdea289dce60e9acf9ab317f4151bfe2c993ddd
Reviewed-on: https://code.wireshark.org/review/31160
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/macosx/osx-app.sh.in')
| -rwxr-xr-x | packaging/macosx/osx-app.sh.in | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/packaging/macosx/osx-app.sh.in b/packaging/macosx/osx-app.sh.in index 21a1ab65e5..3902d83cd8 100755 --- a/packaging/macosx/osx-app.sh.in +++ b/packaging/macosx/osx-app.sh.in @@ -33,6 +33,8 @@ # and "share" directories under the installation directory. # +shopt -s extglob + # Defaults strip=false exclude_prefixes="/System/|/Library/|/usr/lib/|/usr/X11/|/opt/X11/|@rpath|@executable_path" @@ -133,7 +135,12 @@ pkgplugin="$bundle/Contents/PlugIns/wireshark/@VERSION_MAJOR@.@VERSION_MINOR@" # bundle_binary_list=$( find $pkgexec -type f -perm -0555 -print ) -echo -e "\\nFixing up $bundle...\\n" +echo -e "\\nFixing up $bundle..." + +echo -e "\\nPrepopulating our libraries" + +# Copy only <library>.<SOVERSION>.dylib. +cp -v +([^.]).+([[:digit:]]).dylib "$pkglib" # Find out libs we need from Fink, MacPorts, or from a custom install # (i.e. $LIBPREFIX), then loop until no changes. @@ -141,7 +148,7 @@ a=1 nfiles=0 endl=true while $endl; do - echo -e "Looking for dependencies. Round $a" + echo -e "\\nLooking for dependencies. Round $a" # # To find dependencies, we: # |