diff options
author | rhe <rhe@ruby-lang.org> | 2016-06-09 06:03:55 +0000 |
---|---|---|
committer | rhe <rhe@ruby-lang.org> | 2016-06-09 06:03:55 +0000 |
commit | d576ae8eaa5cebd0a4896ef65ac06147e85393ae (patch) | |
tree | 60bbdc6fa298d116378d4231aaaa7a348ba4531d | |
parent | de7c41aef152ece51b143339f4b2a3619ab2364b (diff) | |
download | ruby-openssl-history-d576ae8eaa5cebd0a4896ef65ac06147e85393ae.tar.gz |
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-- | ext/openssl/extconf.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 0b93aac..ad92a28 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" |