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

* ext/extmk.rb: Show a message when extconf.rb raised an exception.

* ext/openssl/extconf.rb: Use exception raising instead of message
  and/or abort. We want to display error message to console _and_
  logging into mkmf.log.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2012-05-18 06:19:25 +00:00
parent d17b97ce64
commit 899bf4981a
3 changed files with 20 additions and 4 deletions

View file

@ -1,3 +1,10 @@
Fri May 18 15:14:32 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* ext/extmk.rb: Show a message when extconf.rb raised an exception.
* ext/openssl/extconf.rb: Use exception raising instead of message
and/or abort. We want to display error message to console _and_
logging into mkmf.log.
Fri May 18 06:14:07 2012 Eric Hodel <drbrain@segment7.net>
* ext/syslog/lib/syslog/logger.rb: Added Syslog::Logger which was

View file

@ -205,6 +205,8 @@ def extmake(target)
end
rescue SystemExit
# ignore
rescue => error
ok = false
ensure
rm_f "conftest*"
$0 = $PROGRAM_NAME
@ -217,7 +219,15 @@ def extmake(target)
f.puts "# " + DUMMY_SIGNATURE
f.print(*dummy_makefile(CONFIG["srcdir"]))
end
print "Failed to configure #{target}. It will not be installed.\n"
mess = "Failed to configure #{target}. It will not be installed.\n"
if error
mess.prepend(error.to_s + "\n")
end
Logging::message(mess)
print(mess)
$stdout.flush
return true
end
args = sysquote($mflags)

View file

@ -55,11 +55,10 @@ unless result
end
unless have_header("openssl/conf_api.h")
message "OpenSSL 0.9.6 or later required.\n"
exit 1
raise "OpenSSL 0.9.6 or later required."
end
unless OpenSSL.check_func("SSL_library_init()", "openssl/ssl.h")
abort "Ignore OpenSSL broken by Apple"
raise "Ignore OpenSSL broken by Apple"
end
message "=== Checking for OpenSSL features... ===\n"