Skip to content

Fix @loader_path find and replace for static builds #2583

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

Open
vnescape wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix @loader_path find and replace for static builds #2583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 13 additions & 10 deletions tools/mac-libs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,12 @@ def strip(lib)
def fixup_libs(prog, orig_path)
throw "fixup_libs: #{prog} doesn't exist" unless File.exist? prog

libs = get_load_libs(prog)
.map { |it| expand_load_path(orig_path, it) }
.select { |it| not system_lib? it[0] }
raw_libs = get_load_libs(prog)

libs = raw_libs.map do |raw|
expanded = expand_load_path(orig_path, raw)
expanded ? [raw, expanded[0], expanded[1]] : nil
end.compact.select { |it| not system_lib? it[1] }

FileUtils.chmod("u+w", prog)
strip prog
Expand All @@ -137,19 +140,19 @@ def fixup_libs(prog, orig_path)
end

libs.each do |lib|
libpath, libtype = lib
raw_str, libpath, libtype = lib
if File.basename(libpath) == File.basename(prog)
if libtype == :absolute
changes += [:change, libpath, File.join("@rpath", File.basename(libpath))]
if raw_str != File.join("@rpath", File.basename(libpath))
changes += [:change, raw_str, File.join("@rpath", File.basename(libpath))]
end
next
end

is_framework, fwpath, fwname, fwlib = detect_framework(libpath)

if is_framework
unless libtype == :rpath
changes += [:change, libpath, File.join("@rpath", fwname, fwlib)]
if raw_str != File.join("@rpath", fwname, fwlib)
changes += [:change, raw_str, File.join("@rpath", fwname, fwlib)]
end

next if File.exist? File.join(frameworks_dir, fwname)
Expand All @@ -162,8 +165,8 @@ def fixup_libs(prog, orig_path)
libname = File.basename(reallibpath)
dest = File.join(frameworks_dir, libname)

if libtype == :absolute
changes += [:change, libpath, File.join("@rpath", libname)]
if raw_str != File.join("@rpath", libname)
changes += [:change, raw_str, File.join("@rpath", libname)]
end

next if File.exist? dest
Expand Down