traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-36577: setup.py reports missing OpenSSL again (GH-12746) 

[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
This commit is contained in:
Christian Heimes 2019-04-09 18:40:12 +02:00 committed by Miss Islington (bot)
parent bb4447897a
commit 8abc3f4f91
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Build/2019-04-09-17-31-47.bpo-36577.34kuUW.rst Normal file
View File

@ -0,0 +1 @@
setup.py now correctly reports missing OpenSSL headers and libraries again.

2
setup.py
View File

@ -2153,6 +2153,7 @@ class PyBuildExt(build_ext):
openssl_libs = split_var('OPENSSL_LIBS', '-l') openssl_libs = split_var('OPENSSL_LIBS', '-l')
if not openssl_libs: if not openssl_libs:
# libssl and libcrypto not found # libssl and libcrypto not found
self.missing.extend(['_ssl', '_hashlib'])
return None, None return None, None
# Find OpenSSL includes # Find OpenSSL includes
@ -2160,6 +2161,7 @@ class PyBuildExt(build_ext):
'openssl/ssl.h', self.inc_dirs, openssl_includes 'openssl/ssl.h', self.inc_dirs, openssl_includes
) )
if ssl_incs is None: if ssl_incs is None:
self.missing.extend(['_ssl', '_hashlib'])
return None, None return None, None
# OpenSSL 1.0.2 uses Kerberos for KRB5 ciphers # OpenSSL 1.0.2 uses Kerberos for KRB5 ciphers