From d2f50f55489b0cf8675263eda0da5bf999c65a3d Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 9 Apr 2019 17:32:36 +0200 Subject: [PATCH] bpo-36577: setup.py reports missing OpenSSL again bpo-36146 introduced another regression. In case of missing OpenSSL libraries or headers, setup.py no longer reported _hashlib and _ssl to be missing. Signed-off-by: Christian Heimes --- Misc/NEWS.d/next/Build/2019-04-09-17-31-47.bpo-36577.34kuUW.rst | 1 + setup.py | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Misc/NEWS.d/next/Build/2019-04-09-17-31-47.bpo-36577.34kuUW.rst diff --git a/Misc/NEWS.d/next/Build/2019-04-09-17-31-47.bpo-36577.34kuUW.rst b/Misc/NEWS.d/next/Build/2019-04-09-17-31-47.bpo-36577.34kuUW.rst new file mode 100644 index 000000000000000..58c0151273096f8 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2019-04-09-17-31-47.bpo-36577.34kuUW.rst @@ -0,0 +1 @@ +setup.py now correctly reports missing OpenSSL headers and libraries again. diff --git a/setup.py b/setup.py index 85c706cf6610f39..30caed5b51c1ea7 100644 --- a/setup.py +++ b/setup.py @@ -2153,6 +2153,7 @@ def split_var(name, sep): openssl_libs = split_var('OPENSSL_LIBS', '-l') if not openssl_libs: # libssl and libcrypto not found + self.missing.extend(['_ssl', '_hashlib']) return None, None # Find OpenSSL includes @@ -2160,6 +2161,7 @@ def split_var(name, sep): 'openssl/ssl.h', self.inc_dirs, openssl_includes ) if ssl_incs is None: + self.missing.extend(['_ssl', '_hashlib']) return None, None # OpenSSL 1.0.2 uses Kerberos for KRB5 ciphers