osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

macOS: Fixup our libssh workaround. 

On the previous builder, `otool -L /path/to/libssh.4.dylib` returned a
bare "libssh.4.dylib", which required a workaround. On the new builder
it returns "@rpath/libssh.4.dylib". Adjust the workaround accordinly.

Remove a couple of chmods while we're here. Permission issues are better
addressed elsewhere.

Change-Id: If0692219d9558c77b45620e7aad309853012b7e8
Reviewed-on: https://code.wireshark.org/review/32059
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2019-02-16 11:29:52 -08:00
parent 09cf98db98
commit 2172fe93e1
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packaging/macosx/osx-app.sh.in
View File

@ -128,9 +128,6 @@ pkgplugin="$bundle/Contents/PlugIns/wireshark/@PLUGIN_PATH_ID@"
# Set the 'macosx' directory, usually the current directory.
#resdir=$( pwd )
# Set our desired permissions
chmod -R u=rwX,go=rX "$bundle"
#
# Get a list of all binaries in the bundle.
# Treat all plain files with read and execute permissions for all as
@ -170,9 +167,10 @@ while $endl; do
#
# use cut to extract the library name from the output;
#
# replace "libssh" with "/usr/local/lib/libssh" because
# replace "@rpath/libssh" with "/usr/local/lib/libssh" so that
# it isn't excluded from subsequent filtering.
# libssh, for some reason, has its "install name" set to
# just libssh.4.dylib, rather than /usr/local/lib/libssh.4.dylib,
# @rpath/libssh.4.dylib, rather than /usr/local/lib/libssh.4.dylib,
# when built by tools/macos-setup.sh;
#
# strip out system libraries, as we don't bundle them with
@ -185,7 +183,7 @@ while $endl; do
otool -L $bundle_binary_list "$pkglib"/*.dylib 2>/dev/null \
| grep -F compatibility \
| cut -d\( -f1 \
| sed '1,$s;^ libssh; /usr/local/lib/libssh;' \
| sed '1,$s;^ @rpath/libssh; /usr/local/lib/libssh;' \
| grep -E -v "$exclude_prefixes" \
| sort \
| uniq \
@ -202,8 +200,6 @@ while $endl; do
fi
done
chmod -R u=rwX,go=rX "$bundle"
# Strip libraries and executables if requested
#----------------------------------------------------------
if [ "$strip" = "true" ]; then