admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Revert "keg_relocate: fix relocation of frameworks"

Browse Source 
This reverts commit 14ce4027ae5b8aa994f4bdf0b8160bbc4994948b.
This commit is contained in:
Mike McQuaid 2015-11-08 14:00:27 -08:00
parent 06634edab7
commit f59ad1c9e9
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/keg_relocate.rb
View File

@ -2,10 +2,6 @@ class Keg
PREFIX_PLACEHOLDER = "@@HOMEBREW_PREFIX@@".freeze PREFIX_PLACEHOLDER = "@@HOMEBREW_PREFIX@@".freeze
CELLAR_PLACEHOLDER = "@@HOMEBREW_CELLAR@@".freeze CELLAR_PLACEHOLDER = "@@HOMEBREW_CELLAR@@".freeze
# Matches framework references like `XXX.framework/Versions/YYY/XXX` and
# `XXX.framework/XXX`, both with or without a slash-delimited prefix.
FRAMEWORK_RX = %r{(?:^|/)(?<suffix>(?<name>[^/]+)\.framework/(?:Versions/[^/]+/)?\k<name>)$}.freeze
def fix_install_names(options = {}) def fix_install_names(options = {})
mach_o_files.each do |file| mach_o_files.each do |file|
file.ensure_writable do file.ensure_writable do
@ -134,7 +130,7 @@ class Keg
"@loader_path/#{bad_name}" "@loader_path/#{bad_name}"
elsif file.mach_o_executable? && (lib + bad_name).exist? elsif file.mach_o_executable? && (lib + bad_name).exist?
"#{lib}/#{bad_name}" "#{lib}/#{bad_name}"
elsif (abs_name = find_dylib(bad_name)) && abs_name.exist? elsif (abs_name = find_dylib(Pathname.new(bad_name).basename)) && abs_name.exist?
abs_name.to_s abs_name.to_s
else else
opoo "Could not fix #{bad_name} in #{file}" opoo "Could not fix #{bad_name} in #{file}"
@ -160,18 +156,8 @@ class Keg
opt_record.join(relative_dirname, basename).to_s opt_record.join(relative_dirname, basename).to_s
end end
def find_dylib_suffix_from(bad_name) def find_dylib(name)
if (framework = bad_name.match(FRAMEWORK_RX)) lib.find { |pn| break pn if pn.basename == name } if lib.directory?
framework["suffix"]
else
File.basename(bad_name)
end
end
def find_dylib(bad_name)
return unless lib.directory?
suffix = "/#{find_dylib_suffix_from(bad_name)}"
lib.find { |pn| break pn if pn.to_s.end_with?(suffix) }
end end
def mach_o_files def mach_o_files