naruse	2017-03-12 16:51:35 +0900 (Sun, 12 Mar 2017)

  New Revision: 57898

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

  Log:
    merge revision(s) 57590,57591,57592: [Backport #13200]
    
    extmk.rb: split notes
    
    * ext/extmk.rb: split notes and echo per lines, for multiple lines
      messages.  [ruby-core:79475] [Bug #13200]
    openssl: fix broken openssl check
    
    * ext/openssl/extconf.rb: check for broken OpenSSL only on mac OS.
      [ruby-core:79475] [Bug #13200]
    openssl: fix broken openssl check
    
    * ext/openssl/deprecation.rb: check for broken OpenSSL only on mac
      OS.  [ruby-core:79475] [Bug #13200]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/ext/extmk.rb
    branches/ruby_2_4/ext/openssl/deprecation.rb
    branches/ruby_2_4/ext/openssl/extconf.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/ext/openssl/deprecation.rb
===================================================================
--- ruby_2_4/ext/openssl/deprecation.rb	(revision 57897)
+++ ruby_2_4/ext/openssl/deprecation.rb	(revision 57898)
@@ -3,7 +3,7 @@ module OpenSSL https://github.com/ruby/ruby/blob/trunk/ruby_2_4/ext/openssl/deprecation.rb#L3
   def self.deprecated_warning_flag
     unless flag = (@deprecated_warning_flag ||= nil)
       if try_compile("", flag = "-Werror=deprecated-declarations")
-        if with_config("broken-apple-openssl")
+        if /darwin/ =~ RUBY_PLATFORM and with_config("broken-apple-openssl")
           flag = "-Wno-deprecated-declarations"
         end
         $warnflags << " #{flag}"
Index: ruby_2_4/ext/openssl/extconf.rb
===================================================================
--- ruby_2_4/ext/openssl/extconf.rb	(revision 57897)
+++ ruby_2_4/ext/openssl/extconf.rb	(revision 57898)
@@ -60,7 +60,7 @@ unless result https://github.com/ruby/ruby/blob/trunk/ruby_2_4/ext/openssl/extconf.rb#L60
   raise "OpenSSL 0.9.8 or later required."
 end
 
-unless OpenSSL.check_func("SSL_library_init()", "openssl/ssl.h")
+if /darwin/ =~ RUBY_PLATFORM and !OpenSSL.check_func("SSL_library_init()", "openssl/ssl.h")
   raise "Ignore OpenSSL broken by Apple.\nPlease use another openssl. (e.g. using `configure --with-openssl-dir=/path/to/openssl')"
 end
 
Index: ruby_2_4/ext/extmk.rb
===================================================================
--- ruby_2_4/ext/extmk.rb	(revision 57897)
+++ ruby_2_4/ext/extmk.rb	(revision 57898)
@@ -809,9 +809,12 @@ if $configure_only and $command_output https://github.com/ruby/ruby/blob/trunk/ruby_2_4/ext/extmk.rb#L809
       fails.each do |d, n, err|
         d = "#{d}:#{n}:"
         if err
-          d << " " << err
+          err.scan(/.+/) do |e|
+            mf.puts %Q<\t@echo "#{d} #{e.gsub(/["`$^]/, '\\\\\\&')}">
+          end
+        else
+          mf.puts %Q<\t@echo "#{d}">
         end
-        mf.puts %Q<\t@echo "#{d}">
       end
       mf.puts %Q<\t@echo "*** Fix the problems, then remove these directories and try again if you want.">
     end
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57897)
+++ ruby_2_4/version.h	(revision 57898)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-12"
-#define RUBY_PATCHLEVEL 55
+#define RUBY_PATCHLEVEL 56
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57590-57592


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