RubyGems patches by Yusuke ENDOH [ruby-core:17442], [ruby-core:17444].

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17754 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f53d47d03..00ddf574a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jul  1 03:28:16 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rubygems/test_ext_configure_builder.rb:  Apply locale-free
+	patch by Yusuke ENDOH.  [ruby-core:17444].
+
+	* runruby.rb:  Set ENV['rake'].  Patch by Yusuke ENDOH
+	[ruby-core:17442].
+
 Tue Jul  1 01:07:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
diff --git a/runruby.rb b/runruby.rb
index 8b0e9c20e..95e2906ca 100755
--- a/runruby.rb
+++ b/runruby.rb
@@ -46,6 +46,7 @@ libs << File.expand_path("lib", srcdir)
 config["bindir"] = abs_archdir
 ENV["RUBY"] = File.expand_path(ruby)
 ENV["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR)
+ENV["rake"] = ENV["RUBY"] + " " + File.join(abs_archdir, "bin", "rake")
 
 if pure
   libs << File.expand_path("ext", srcdir) << "-"
diff --git a/test/rubygems/test_gem_ext_configure_builder.rb b/test/rubygems/test_gem_ext_configure_builder.rb
index 2ed273a19..aa7db475f 100644
--- a/test/rubygems/test_gem_ext_configure_builder.rb
+++ b/test/rubygems/test_gem_ext_configure_builder.rb
@@ -47,9 +47,9 @@ class TestGemExtConfigureBuilder < RubyGemTestCase
       end
     end
 
-    shell_error_msg = %r{(\./configure: No such file or directory)|(Can't open \./configure)}
+    shell_error_msg = %r{(\./configure: .*)|(Can't open \./configure)}
     sh_prefix_configure = "sh ./configure --prefix="
-    
+
     expected = %r(configure failed:
 
 #{Regexp.escape sh_prefix_configure}#{Regexp.escape @dest_path}