summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-12-08 13:34:33 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-12-08 13:34:33 +0000
commitd9d841e35319353b8ed7174e48af7d9f84197c9c (patch)
tree147c442d38cda68969f2e821421f4a5ee9754f68
parent518a3402531ea898c6fc72bb8ce5a381eb4f06ef (diff)
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rwxr-xr-xext/extmk.rb2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7165502297..527149d134 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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