diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | ext/extmk.rb | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Thu Dec 8 22:31:13 2011 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/extmk.rb (extract_makefile): need to sort the array of current + srcs before comparing to the sorted old srcs. + fixed the problem that the configuring stage of exts were always + run, introduced at r33801. + Thu Dec 8 13:26:24 2011 NAKAMURA Usaku <usa@ruby-lang.org> * test/rexml/test_order.rb (OrderTester#test_more_ordering): use diff --git a/ext/extmk.rb b/ext/extmk.rb index b87c6ab7b8..ca32da30c6 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -73,7 +73,7 @@ def extract_makefile(makefile, keep = true) end return false end - srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")].map {|fn| File.basename(fn)} + srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")].sort.map {|fn| File.basename(fn)} if !srcs.empty? old_srcs = m[/^ORIG_SRCS[ \t]*=[ \t](.*)/, 1] or return false old_srcs.split.sort == srcs or return false |