diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-12-05 16:18:22 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-12-05 18:23:01 +0900 |
| commit | c3abbc1b2f52015dc839fd96545380dbc11c77a9 (patch) | |
| tree | b890e4f35846bc6a95efce1bbd87ed6c3b1785ec | |
| parent | 4c88107c54b06c1a3e89970eb243c8ac887d84e1 (diff) | |
ext/openssl/extconf.rb: check with -Werror=deprecated-declarations
This reverts commit 0d7d8b2989e1738dd902d354cc41186899e6b71e,
but restore `$warnflags` without the flag, to get rid of using
deprecated functions.
| -rw-r--r-- | ext/openssl/deprecation.rb | 18 | ||||
| -rw-r--r-- | ext/openssl/extconf.rb | 4 |
2 files changed, 21 insertions, 1 deletions
diff --git a/ext/openssl/deprecation.rb b/ext/openssl/deprecation.rb index 6f08a206b4..afe989ead1 100644 --- a/ext/openssl/deprecation.rb +++ b/ext/openssl/deprecation.rb @@ -1,7 +1,23 @@ # frozen_string_literal: false module OpenSSL + def self.deprecated_warning_flag + unless flag = (@deprecated_warning_flag ||= nil) + if try_compile("", flag = "-Werror=deprecated-declarations") + $warnflags = "#{@warnflags = $warnflags}" #{flag}" + else + flag = "" + end + @deprecated_warning_flag = flag + end + flag + end + + def self.restore_warning_flag + $warnflags = @warnflags + end + def self.check_func(func, header) - have_func(func, header) + have_func(func, header, deprecated_warning_flag) end def self.check_func_or_macro(func, header) diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 5726007697..264130bb51 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -19,6 +19,9 @@ dir_config("kerberos") Logging::message "=== OpenSSL for Ruby configurator ===\n" +# Check with -Werror=deprecated-declarations if available +OpenSSL.deprecated_warning_flag + ## # Adds -DOSSL_DEBUG for compilation and some more targets when GCC is used # To turn it on, use: --with-debug or --enable-debug @@ -166,5 +169,6 @@ have_func("EVP_PBE_scrypt") Logging::message "=== Checking done. ===\n" create_header +OpenSSL.restore_warning_flag create_makefile("openssl") Logging::message "Done.\n" |