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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@42463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 56 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 883f0fed76..f0baed074b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Aug  9 16:29:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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.
+
 Fri Aug  9 15:59:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (parser_peek_variable_name): treat invalid global, class,
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 8f4e69e429..80c1f49e66 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -300,7 +300,7 @@ end
 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
diff --git a/test/mkmf/test_framework.rb b/test/mkmf/test_framework.rb
new file mode 100644
index 0000000000..48e8bf7213
--- /dev/null
+++ b/test/mkmf/test_framework.rb
@@ -0,0 +1,46 @@
+require_relative 'base'
+
+class TestMkmf
+  class TestHaveFramework < TestMkmf
+    def create_framework(fw, hdrname = "#{fw}.h")
+      Dir.mktmpdir("frameworks") do |dir|
+        fwdir = "#{dir}/#{fw}.framework"
+        hdrdir = "#{fwdir}/Headers"
+        FileUtils.mkdir_p(hdrdir)
+        File.write("#{hdrdir}/#{hdrname}", "")
+        src = "#{fwdir}/main.c"
+        File.write(src, "void #{fw}(void) {}")
+        cmd = LINK_SO.dup
+        RbConfig.expand(cmd, RbConfig::CONFIG.merge("OBJS"=>src))
+        cmd.gsub!("$@", "#{fwdir}/#{fw}")
+        cmd.gsub!(/ -bundle /, ' -dynamiclib ')
+        assert(xsystem(cmd), MKMFLOG)
+        $INCFLAGS << " " << "-F#{dir}".quote
+        yield fw, hdrname
+      end
+    end
+
+    def test_core_foundation_framework
+      assert(have_framework("CoreFoundation"), mkmflog("try as Objective-C"))
+    end
+
+    def test_multi_frameworks
+      assert(have_framework("CoreFoundation"), mkmflog("try as Objective-C"))
+      assert(have_framework("Cocoa"), mkmflog("try as Objective-C"))
+    end
+
+    def test_empty_framework
+      create_framework("MkmfTest") do |fw|
+        assert(have_framework(fw), MKMFLOG)
+      end
+    end
+
+    def test_different_name_header
+      bug8593 = '[ruby-core:55745] [Bug #8593]'
+      create_framework("MkmfTest", "test_mkmf.h") do |fw, hdrname|
+        assert(!have_framework(fw), MKMFLOG)
+        assert(have_framework([fw, hdrname]), MKMFLOG)
+      end
+    end
+  end
+end if /darwin/ =~ RUBY_PLATFORM
diff --git a/version.h b/version.h
index 14dccf8855..a16084c75a 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 463
+#define RUBY_PATCHLEVEL 464
 
 #define RUBY_RELEASE_DATE "2013-08-09"
 #define RUBY_RELEASE_YEAR 2013