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

os/mac: Update ruby-macho calls for compatibility with 0.2.5.

Browse Source 
Closes #656.

Signed-off-by: Martin Afanasjew <martin@afanasjew.de>
This commit is contained in:
William Woodruff 2016-08-07 13:37:23 -04:00 committed by Martin Afanasjew
parent 5caa812e2c
commit 97a66aa513
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/os/mac/ruby_keg.rb
View File

@ -4,7 +4,7 @@ module RubyKeg
def change_dylib_id(id, file)
@require_install_name_tool = true
puts "Changing dylib ID of #{file}\n from #{file.dylib_id}\n to #{id}" if ARGV.debug?
MachO::Tools.change_dylib_id(file, id)
MachO::Tools.change_dylib_id(file, id, :strict => false)
rescue MachO::MachOError
onoe <<-EOS.undent
Failed changing dylib ID of #{file}
@ -17,7 +17,7 @@ module RubyKeg
def change_install_name(old, new, file)
@require_install_name_tool = true
puts "Changing install name in #{file}\n from #{old}\n to #{new}" if ARGV.debug?
MachO::Tools.change_install_name(file, old, new)
MachO::Tools.change_install_name(file, old, new, :strict => false)
rescue MachO::MachOError
onoe <<-EOS.undent
Failed changing install name in #{file}

7
Library/Homebrew/os/mac/ruby_mach.rb
View File

@ -14,7 +14,7 @@ module RubyMachO
machos = []
mach_data = []
if MachO.fat_magic?(macho.magic)
if MachO::Utils.fat_magic?(macho.magic)
machos = macho.machos
else
machos << macho
@ -28,9 +28,8 @@ module RubyMachO
end
type = case m.filetype
when "MH_EXECUTE" then :executable
when "MH_DYLIB" then :dylib
when "MH_BUNDLE" then :bundle
when :dylib, :bundle then m.filetype
when :execute then :executable
else :dunno
end