From 1277fa045fd01531cf328ee0e1c05f5f59786e0b Mon Sep 17 00:00:00 2001 From: rhe Date: Thu, 9 Jun 2016 06:03:55 +0000 Subject: 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 --- ChangeLog | 7 +++++++ ext/openssl/extconf.rb | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef333bcb92..1cf70635bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jun 9 15:03:35 2016 Kazuki Yamaguchi + + * 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 * 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" -- cgit v1.2.3