nagachika	2013-08-03 22:50:36 +0900 (Sat, 03 Aug 2013)

  New Revision: 42358

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42358

  Log:
    merge revision(s) 42223: [Backport #8702]
    
    * lib/mkmf.rb (xsystem): expand environment variable in all macros not
      expanded with RbConfig.  [Bug #8702]
    
    * test/mkmf/test_framework.rb (create_framework): replace all $@ not
      only once.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/mkmf.rb
    branches/ruby_2_0_0/test/mkmf/test_framework.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 42357)
+++ ruby_2_0_0/ChangeLog	(revision 42358)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Aug  3 22:46:19 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (xsystem): expand environment variable in all macros not
+	  expanded with RbConfig.  [Bug #8702]
+
+	* test/mkmf/test_framework.rb (create_framework): replace all $@ not
+	  only once.
+
 Sat Aug  3 22:40:57 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (have_framework): allow header file to check.
Index: ruby_2_0_0/lib/mkmf.rb
===================================================================
--- ruby_2_0_0/lib/mkmf.rb	(revision 42357)
+++ ruby_2_0_0/lib/mkmf.rb	(revision 42358)
@@ -352,7 +352,7 @@ module MakeMakefile https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/mkmf.rb#L352
   def xsystem command, opts = nil
     varpat = /\$\((\w+)\)|\$\{(\w+)\}/
     if varpat =~ command
-      vars = Hash.new {|h, k| h[k] = ''; ENV[k]}
+      vars = Hash.new {|h, k| h[k] = ENV[k]}
       command = command.dup
       nil while command.gsub!(varpat) {vars[$1||$2]}
     end
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 42357)
+++ ruby_2_0_0/version.h	(revision 42358)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-08-03"
-#define RUBY_PATCHLEVEL 286
+#define RUBY_PATCHLEVEL 287
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 8
Index: ruby_2_0_0/test/mkmf/test_framework.rb
===================================================================
--- ruby_2_0_0/test/mkmf/test_framework.rb	(revision 42357)
+++ ruby_2_0_0/test/mkmf/test_framework.rb	(revision 42358)
@@ -12,8 +12,8 @@ class TestMkmf https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/mkmf/test_framework.rb#L12
         File.write(src, "void #{fw}(void) {}")
         cmd = LINK_SO.dup
         RbConfig.expand(cmd, RbConfig::CONFIG.merge("OBJS"=>src))
-        cmd.sub!("$@", "#{fwdir}/#{fw}")
-        cmd.sub!(/ -bundle /, ' -dynamiclib ')
+        cmd.gsub!("$@", "#{fwdir}/#{fw}")
+        cmd.gsub!(/ -bundle /, ' -dynamiclib ')
         assert(xsystem(cmd), MKMFLOG)
         $INCFLAGS << " " << "-F#{dir}".quote
         yield fw, hdrname

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42223


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/