naruse	2015-02-13 14:00:23 +0900 (Fri, 13 Feb 2015)

  New Revision: 49581

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

  Log:
    merge revision(s) 49482,49487: [Backport #10821]
    
    * lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of
      interference by modifying global variables in have_devel? method.
      [ruby-core:67962] [Bug #10821]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/lib/mkmf.rb
    branches/ruby_2_2/test/mkmf/base.rb
    branches/ruby_2_2/test/mkmf/test_flags.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49580)
+++ ruby_2_2/ChangeLog	(revision 49581)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Fri Feb 13 13:59:56 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of
+	  interference by modifying global variables in have_devel? method.
+	  [ruby-core:67962] [Bug #10821]
+
 Fri Feb 13 03:13:05 2015  Scott Francis  <scott.francis@s...>
 
 	* thread_pthread.c (reserve_stack): fix intermittent SIGBUS on
Index: ruby_2_2/lib/mkmf.rb
===================================================================
--- ruby_2_2/lib/mkmf.rb	(revision 49580)
+++ ruby_2_2/lib/mkmf.rb	(revision 49581)
@@ -610,9 +610,7 @@ MSG https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/mkmf.rb#L610
   end
 
   def try_cppflags(flags)
-    with_cppflags(flags) do
-      try_header("int main() {return 0;}")
-    end
+    try_header(MAIN_DOES_NOTHING, flags)
   end
 
   def with_cflags(flags)
@@ -624,9 +622,7 @@ MSG https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/mkmf.rb#L622
   end
 
   def try_cflags(flags)
-    with_cflags(flags) do
-      try_compile("int main() {return 0;}")
-    end
+    try_compile(MAIN_DOES_NOTHING, flags)
   end
 
   def with_ldflags(flags)
@@ -638,9 +634,7 @@ MSG https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/mkmf.rb#L634
   end
 
   def try_ldflags(flags)
-    with_ldflags(flags) do
-      try_link("int main() {return 0;}")
-    end
+    try_link(MAIN_DOES_NOTHING, flags)
   end
 
   def try_static_assert(expr, headers = nil, opt = "", &b)
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49580)
+++ ruby_2_2/version.h	(revision 49581)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-02-13"
-#define RUBY_PATCHLEVEL 44
+#define RUBY_PATCHLEVEL 45
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_2/test/mkmf/base.rb
===================================================================
--- ruby_2_2/test/mkmf/base.rb	(revision 49580)
+++ ruby_2_2/test/mkmf/base.rb	(revision 49581)
@@ -49,7 +49,9 @@ class TestMkmf < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/mkmf/base.rb#L49
       @buffer << s if @out
     end
   end
+end
 
+module TestMkmf::Base
   attr_reader :stdout
 
   def mkmflog(msg)
@@ -84,7 +86,7 @@ class TestMkmf < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/mkmf/base.rb#L86
     @tmpdir = Dir.mktmpdir
     @curdir = Dir.pwd
     @mkmfobj = Object.new
-    @stdout = Capture.new
+    @stdout = TestMkmf::Capture.new
     Dir.chdir(@tmpdir)
     @quiet, Logging.quiet = Logging.quiet, true
     init_mkmf
@@ -127,3 +129,11 @@ class TestMkmf < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/mkmf/base.rb#L129
     nil
   end
 end
+
+class TestMkmf
+  include TestMkmf::Base
+
+  def assert_separately(args, src, *rest)
+    super(args + ["-r#{__FILE__}"], "extend TestMkmf::Base; setup\n#{src}", *rest)
+  end
+end
Index: ruby_2_2/test/mkmf/test_flags.rb
===================================================================
--- ruby_2_2/test/mkmf/test_flags.rb	(revision 49580)
+++ ruby_2_2/test/mkmf/test_flags.rb	(revision 49581)
@@ -31,5 +31,26 @@ class TestMkmf https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/mkmf/test_flags.rb#L31
       $warnflags = warnflags
       $extmk = val
     end
+
+    def test_try_ldflag_invalid_opt
+      assert_separately([], <<-'end;') #do
+        assert(!try_ldflags("nosuch.c"), TestMkmf::MKMFLOG)
+        assert(have_devel?, TestMkmf::MKMFLOG)
+      end;
+    end
+
+    def test_try_cflag_invalid_opt
+      assert_separately([], <<-'end;') #do
+        assert(!try_cflags("nosuch.c"), TestMkmf::MKMFLOG)
+        assert(have_devel?, TestMkmf::MKMFLOG)
+      end;
+    end
+
+    def test_try_cppflag_invalid_opt
+      assert_separately([], <<-'end;') #do
+        assert(!try_cppflags("nosuch.c"), TestMkmf::MKMFLOG)
+        assert(have_devel?, TestMkmf::MKMFLOG)
+      end;
+    end
   end
 end

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49482,49487


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