Created
May 6, 2020 15:12
-
-
Save nmusco/f8c792e5b26279e21713401565227b1c to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- setup.py 2016-06-25 17:49:32.000000000 -0400 | |
+++ setup.py 2020-05-06 11:06:32.000000000 -0400 | |
@@ -808,11 +808,9 @@ | |
depends=['socketmodule.h'], | |
libraries=math_libs) ) | |
# Detect SSL support for the socket module (via _ssl) | |
- search_for_ssl_incs_in = [ | |
- '/usr/local/ssl/include', | |
- '/usr/contrib/ssl/include/' | |
- ] | |
- ssl_incs = find_file('openssl/ssl.h', inc_dirs, | |
+ CUSTOM_OPENSSL = '/usr/local/ssl' | |
+ search_for_ssl_incs_in = [ os.path.join(CUSTOM_OPENSSL, 'include') ] | |
+ ssl_incs = find_file('openssl/ssl.h', [], | |
search_for_ssl_incs_in | |
) | |
if ssl_incs is not None: | |
@@ -820,17 +818,16 @@ | |
['/usr/kerberos/include']) | |
if krb5_h: | |
ssl_incs += krb5_h | |
- ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, | |
- ['/usr/local/ssl/lib', | |
- '/usr/contrib/ssl/lib/' | |
- ] ) | |
+ ssl_libs = find_library_file(self.compiler, 'ssl', [], | |
+ [ os.path.join(CUSTOM_OPENSSL, 'lib') ] ) | |
if (ssl_incs is not None and | |
ssl_libs is not None): | |
exts.append( Extension('_ssl', ['_ssl.c'], | |
include_dirs = ssl_incs, | |
- library_dirs = ssl_libs, | |
- libraries = ['ssl', 'crypto'], | |
+ library_dirs = [], | |
+ extra_link_args = [ os.path.join(CUSTOM_OPENSSL, 'lib/libssl.a'), | |
+ os.path.join(CUSTOM_OPENSSL, 'lib/libcrypto.a'), '-ldl'], | |
depends = ['socketmodule.h']), ) | |
else: | |
missing.append('_ssl') | |
@@ -868,8 +865,9 @@ | |
# of hash functions from the OpenSSL library. | |
exts.append( Extension('_hashlib', ['_hashopenssl.c'], | |
include_dirs = ssl_incs, | |
- library_dirs = ssl_libs, | |
- libraries = ['ssl', 'crypto']) ) | |
+ library_dirs = [], | |
+ extra_link_args = [ os.path.join(CUSTOM_OPENSSL, 'lib/libssl.a'), | |
+ os.path.join(CUSTOM_OPENSSL, 'lib/libcrypto.a'), '-ldl'],) ) | |
else: | |
print ("warning: openssl 0x%08x is too old for _hashlib" % | |
openssl_ver) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment