diff options
author | Gerald Combs <gerald@wireshark.org> | 2022-08-18 11:11:14 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2022-08-18 11:11:14 -0700 |
commit | bf6f2068ab880fc3a0b7eab0476a52e8e68d7c65 (patch) | |
tree | 5cae9f5ac1e497344a17c9c561482a71593aeb90 /packaging | |
parent | b51a66f4f1fb941b4685eb4160d2eeee95d6621b (diff) |
macOS: Try to make sure we can find brotli.
libbrotlidec and libbrotlicommon show up in `otool -L` without any path
information on the macOS builders, similar to what's described at
https://github.com/google/brotli/issues/934
Try to work around this in osx-app.sh.
Diffstat (limited to 'packaging')
-rwxr-xr-x | packaging/macosx/osx-app.sh.in | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/packaging/macosx/osx-app.sh.in b/packaging/macosx/osx-app.sh.in index fa32b38034..149b395f54 100755 --- a/packaging/macosx/osx-app.sh.in +++ b/packaging/macosx/osx-app.sh.in @@ -320,6 +320,17 @@ rpathify_file () { echo "Changing reference to $dep_lib to $to in $1" /usr/bin/install_name_tool -change "$dep_lib" "$to" "$1" done + + # + # Try to work around brotli's lack of a full path + # https://github.com/google/brotli/issues/934 + # + otool -L "$1" | grep '^ libbrotli' | awk '{print $1}' | \ + while read -r base ; do + to="@rpath/$base" + echo "Changing reference to $base to $to in $1" + /usr/bin/install_name_tool -change "$base" "$to" "$1" + done fi # |