]> granicus.if.org Git - python/commitdiff
bpo-36577: setup.py reports missing OpenSSL again (GH-12746)
authorChristian Heimes <christian@python.org>
Tue, 9 Apr 2019 16:40:12 +0000 (18:40 +0200)
committerMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Tue, 9 Apr 2019 16:40:12 +0000 (09:40 -0700)
[bpo-36146](https://bugs.python.org/issue36146) 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 <christian@python.org>
https://bugs.python.org/issue36577

Misc/NEWS.d/next/Build/2019-04-09-17-31-47.bpo-36577.34kuUW.rst [new file with mode: 0644]
setup.py

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 (file)
index 0000000..58c0151
--- /dev/null
@@ -0,0 +1 @@
+setup.py now correctly reports missing OpenSSL headers and libraries again.
index 85c706cf6610f39f02b7f35e52f67b5b2a9c3d93..30caed5b51c1ea78740487e56489e52f8bd11476 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2153,6 +2153,7 @@ class PyBuildExt(build_ext):
         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 @@ class PyBuildExt(build_ext):
             '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