[26524] users/pipping/merge.rb
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jun 27 12:07:00 PDT 2007
Revision: 26524
http://trac.macosforge.org/projects/macports/changeset/26524
Author: pipping at macports.org
Date: 2007-06-27 12:07:00 -0700 (Wed, 27 Jun 2007)
Log Message:
-----------
call otool instead of otool64 for 64bit architectures
Modified Paths:
--------------
users/pipping/merge.rb
Modified: users/pipping/merge.rb
===================================================================
--- users/pipping/merge.rb 2007-06-27 18:55:46 UTC (rev 26523)
+++ users/pipping/merge.rb 2007-06-27 19:07:00 UTC (rev 26524)
@@ -200,14 +200,15 @@
}
links=Hash.new
ARGS.each {|my_arch|
- links[my_arch]=%x{
- #{'otool'} -arch #{my_arch} -LX #{
- File.join(arguments[:root],my_arch,path)}
- }.split("\n").collect {|x|
- x.lstrip.gsub(
- / \(compatibility version \d+(\.\d+)*, current version \d+(\.\d+)*\)/, ''
- )
- }.to_set
+ links[my_arch]=%x{#{
+ my_arch =~ /64$/ ? 'otool64' : 'otool'
+ } -arch #{my_arch} -LX #{
+ File.join(arguments[:root],my_arch,path)}
+ }.split("\n").collect {|x|
+ x.lstrip.gsub(
+ / \(compatibility version \d+(\.\d+)*, current version \d+(\.\d+)*\)/, ''
+ )
+ }.to_set
}
whitelist=%w{
/usr/lib/libgcc_s.1.dylib
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070627/ac38a436/attachment.html
More information about the macports-changes
mailing list