Skip to content

Improve macOS installer dylib path patching #1936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iakov merged 4 commits into from
May 7, 2025
Merged

Improve macOS installer dylib path patching #1936

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d7b641
Improve macOS installer dylib path patching
MinyazevR May 7, 2025
e71d216
Improve the code
MinyazevR May 7, 2025
1fe41de
Use set -x instead of echo
MinyazevR May 7, 2025
0b716ab
Use tabs instead of spaces
MinyazevR May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions installer/utils/mac_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export BUNDLE_CONTENTS=$PWD/../data/$PRODUCT_DISPLAYED_NAME.app/Contents/
export LIB_PATH=@executable_path/../Lib

function fix_dependencies {
set -ueo pipefail
set -ueox pipefail
local target="$1"
pushd "$(dirname "$target")"
local prefix=$(grealpath -e "$2")
Expand All @@ -25,10 +25,15 @@ function fix_dependencies {
continue;
fi
normalized=$(grealpath -e "$dep")
if [[ "$normalized" == "/usr/local"/* ]] ; then
relative=$(basename "$normalized")
fi

if [[ "$normalized" == "$prefix"/* ]] ; then
relative=$(grealpath -e --relative-to "$prefix" "$normalized")
change="$change -change \"$dep\" \"$subst/$relative\""
fi

change="$change -change \"$dep\" \"$subst/$relative\""
done
popd
if [[ -n "$change" ]] ; then
Expand Down
Loading