diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-12 07:51:35 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-12 07:51:35 +0000 |
| commit | 4998cf1a67d9ba93f82d52c9259cadd62d18acee (patch) | |
| tree | 312d7c377d87f825f722ff5eef0e45367842a315 /ext | |
| parent | bfd1b7929961fef3e6bc0e99eedf4967628af4e1 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rwxr-xr-x | ext/extmk.rb | 7 | ||||
| -rw-r--r-- | ext/openssl/deprecation.rb | 2 | ||||
| -rw-r--r-- | ext/openssl/extconf.rb | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 04d374ece6..0274794b82 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -809,9 +809,12 @@ if $configure_only and $command_output 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 diff --git a/ext/openssl/deprecation.rb b/ext/openssl/deprecation.rb index 7dfc87c1c6..0c3ab6287e 100644 --- a/ext/openssl/deprecation.rb +++ b/ext/openssl/deprecation.rb @@ -3,7 +3,7 @@ module OpenSSL 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}" diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 60bd518e16..96982309c3 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -60,7 +60,7 @@ unless result 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 |