diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-30 21:03:38 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-30 21:03:38 +0000 |
| commit | 26e258c807c25097ae41e9c5d7dcb3b7a3bda64c (patch) | |
| tree | 25fcab122d349a4ea9cb97de477b66859a243270 /ext/digest/sha2/extconf.rb | |
| parent | 0f1181a5390df3ac3a8e2d9f8bd9815c1215e94b (diff) | |
* ext/digest/*/extconf.rb: use pkg_config to use same library with
openssl. [ruby-core:44755][Bug #6379]
* ext/openssl/deprecation.rb: extract check for broken Apple OpenSSL.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/digest/sha2/extconf.rb')
| -rw-r--r-- | ext/digest/sha2/extconf.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb index e0634245a9..05d0b8de33 100644 --- a/ext/digest/sha2/extconf.rb +++ b/ext/digest/sha2/extconf.rb @@ -9,10 +9,12 @@ $INCFLAGS << " -I$(srcdir)/.." $objs = [ "sha2init.#{$OBJEXT}" ] dir_config("openssl") +pkg_config("openssl") +require_relative '../../openssl/deprecation' if !with_config("bundled-sha2") && have_library("crypto") && - %w[SHA256 SHA512].all? {|d| have_func("#{d}_Transform", "openssl/sha.h")} && + %w[SHA256 SHA512].all? {|d| OpenSSL.check_func("#{d}_Transform", "openssl/sha.h")} && %w[SHA256 SHA512].all? {|d| have_type("#{d}_CTX", "openssl/sha.h")} $objs << "sha2ossl.#{$OBJEXT}" $defs << "-DSHA2_USE_OPENSSL" @@ -26,8 +28,5 @@ have_header("sys/cdefs.h") $preload = %w[digest] if have_type("uint64_t", "defs.h", $defs.join(' ')) - if try_compile("", flag = " -Wno-deprecated-declarations") - $warnflags << flag - end create_makefile("digest/sha2") end |