macOS: Add a workaround for libbrotli.
When gathering our dependencies, work around an issue with libbrotli's install name similar to what we do with libssh. Bug: 15730 Change-Id: I571746848e3343d81c286be66f6fe6510c698d6f Reviewed-on: https://code.wireshark.org/review/32990 Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
parent
6f1efd7518
commit
64a56cf7a6
|
@ -173,6 +173,11 @@ while $endl; do
|
|||
# @rpath/libssh.4.dylib, rather than /usr/local/lib/libssh.4.dylib,
|
||||
# when built by tools/macos-setup.sh;
|
||||
#
|
||||
# replace "\tlibbrotli" with "\t/usr/local/lib/libbrotli" so that
|
||||
# it isn't excluded from subsequent filtering.
|
||||
# libbrotli, for some reason, doesn't have a path prefix in its
|
||||
# "install name" when built by tools/macos-setup.sh;
|
||||
#
|
||||
# strip out system libraries, as we don't bundle them with
|
||||
# Wireshark;
|
||||
#
|
||||
|
@ -184,6 +189,7 @@ while $endl; do
|
|||
| grep -F compatibility \
|
||||
| cut -d\( -f1 \
|
||||
| sed '1,$s;^ @rpath/libssh; /usr/local/lib/libssh;' \
|
||||
| sed '1,$s;^ libbrotli; /usr/local/lib/libbrotli;' \
|
||||
| grep -E -v "$exclude_prefixes" \
|
||||
| sort \
|
||||
| uniq \
|
||||
|
|
Loading…
Reference in New Issue