kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/openssl/extconf.rb: Use Logging::message instead of message.

Browse source 
* ext/zlib/extconf.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2012-05-18 19:51:58 +00:00
parent 5128c1732e
commit 54872dd7b3
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat May 19 04:46:53 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* ext/openssl/extconf.rb: Use Logging::message instead of message.
* ext/zlib/extconf.rb: ditto.
Fri May 18 18:13:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri May 18 18:13:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (MakeMakefile#configuration): keep space at end of * lib/mkmf.rb (MakeMakefile#configuration): keep space at end of

16
ext/openssl/extconf.rb
View file

@ -20,7 +20,7 @@ require_relative 'deprecation'
dir_config("openssl") dir_config("openssl")
dir_config("kerberos") dir_config("kerberos")
message "=== OpenSSL for Ruby configurator ===\n" Logging::message "=== OpenSSL for Ruby configurator ===\n"
## ##
# Adds -DOSSL_DEBUG for compilation and some more targets when GCC is used # Adds -DOSSL_DEBUG for compilation and some more targets when GCC is used
@ -30,12 +30,12 @@ if with_config("debug") or enable_config("debug")
$defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG" $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
end end
message "=== Checking for system dependent stuff... ===\n" Logging::message "=== Checking for system dependent stuff... ===\n"
have_library("nsl", "t_open") have_library("nsl", "t_open")
have_library("socket", "socket") have_library("socket", "socket")
have_header("assert.h") have_header("assert.h")
message "=== Checking for required stuff... ===\n" Logging::message "=== Checking for required stuff... ===\n"
if $mingw if $mingw
have_library("wsock32") have_library("wsock32")
have_library("gdi32") have_library("gdi32")
@ -48,8 +48,8 @@ unless result
result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")} result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")}
result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")} result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")}
unless result unless result
message "=== Checking for required stuff failed. ===\n" Logging::message "=== Checking for required stuff failed. ===\n"
message "Makefile wasn't created. Fix the errors above.\n" Logging::message "Makefile wasn't created. Fix the errors above.\n"
exit 1 exit 1
end end
end end
@ -61,7 +61,7 @@ unless 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')" raise "Ignore OpenSSL broken by Apple.\nPlease use another openssl. (e.g. using `configure --with-openssl-dir=/path/to/openssl')"
end end
message "=== Checking for OpenSSL features... ===\n" Logging::message "=== Checking for OpenSSL features... ===\n"
have_func("ERR_peek_last_error") have_func("ERR_peek_last_error")
have_func("ASN1_put_eoc") have_func("ASN1_put_eoc")
have_func("BN_mod_add") have_func("BN_mod_add")
@ -146,8 +146,8 @@ have_struct_member("EVP_CIPHER_CTX", "flags", "openssl/evp.h")
have_struct_member("EVP_CIPHER_CTX", "engine", "openssl/evp.h") have_struct_member("EVP_CIPHER_CTX", "engine", "openssl/evp.h")
have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h") have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h")
message "=== Checking done. ===\n" Logging::message "=== Checking done. ===\n"
create_header create_header
create_makefile("openssl") create_makefile("openssl")
message "Done.\n" Logging::message "Done.\n"

4
ext/zlib/extconf.rb
View file

@ -15,7 +15,7 @@ if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
defines = [] defines = []
message 'checking for kind of operating system... ' Logging::message 'checking for kind of operating system... '
os_code = with_config('os-code') || os_code = with_config('os-code') ||
case RUBY_PLATFORM.split('-',2)[1] case RUBY_PLATFORM.split('-',2)[1]
when 'amigaos' then when 'amigaos' then
@ -50,7 +50,7 @@ if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
unless OS_NAMES.key? os_code then unless OS_NAMES.key? os_code then
raise "invalid OS_CODE `#{os_code}'" raise "invalid OS_CODE `#{os_code}'"
end end
message "#{OS_NAMES[os_code]}\n" Logging::message "#{OS_NAMES[os_code]}\n"
defines << "OS_CODE=#{os_code}" defines << "OS_CODE=#{os_code}"
$defs.concat(defines.collect{|d|' -D'+d}) $defs.concat(defines.collect{|d|' -D'+d})