diff options
| author | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-09 06:03:55 +0000 |
|---|---|---|
| committer | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-09 06:03:55 +0000 |
| commit | accd30740c0a7e5a716e04a994c44cdacf4f02c9 (patch) | |
| tree | 67673dd4aa60138655503429ac47beb0632bb5a9 | |
| parent | b5da848df9c0d4829b345098dd37290ff245b6e4 (diff) | |
openssl: fix build with OpenSSL 1.1.0 and no pkg-config
* ext/openssl/extconf.rb: Check for CRYPTO_malloc() and SSL_new().
OpenSSL_add_all_digests() and SSL_library_init() are deprecated and
converted to macros in OpenSSL 1.1.0.
[ruby-core:75225] [Feature #12324]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55335 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/openssl/extconf.rb | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Thu Jun 9 15:03:35 2016 Kazuki Yamaguchi <k@rhe.jp> + + * ext/openssl/extconf.rb: Check for CRYPTO_malloc() and SSL_new(). + OpenSSL_add_all_digests() and SSL_library_init() are deprecated and + converted to macros in OpenSSL 1.1.0. + [ruby-core:75225] [Feature #12324] + Wed Jun 8 23:09:51 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * string.c (rb_str_ascii_casemap): fix compile error. diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 0b93aacbb2..ad92a287a6 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -44,8 +44,8 @@ end result = pkg_config("openssl") && have_header("openssl/ssl.h") unless result result = have_header("openssl/ssl.h") - 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[crypto libeay32].any? {|lib| have_library(lib, "CRYPTO_malloc")} + result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_new")} unless result Logging::message "=== Checking for required stuff failed. ===\n" Logging::message "Makefile wasn't created. Fix the errors above.\n" |