1*fb5941c3SDon Lewisdiff -ur misc/Python-2.7.18/PC/VS9.0/build_ssl.py misc/build/Python-2.7.18/PC/VS9.0/build_ssl.py 2*fb5941c3SDon Lewis--- misc/Python-2.7.18/PC/VS9.0/build_ssl.py 2020-01-10 00:33:20.903051000 -0500 3*fb5941c3SDon Lewis+++ misc/build/Python-2.7.18/PC/VS9.0/build_ssl.py 2020-01-10 00:33:30.274973000 -0500 4e7d4ae22SPedro Giffuni@@ -235,4 +235,4 @@ 50a45483eSPedro Giffuni sys.exit(rc) 60a45483eSPedro Giffuni 70a45483eSPedro Giffuni if __name__=='__main__': 80a45483eSPedro Giffuni- main() 90a45483eSPedro Giffuni+ sys.exit(0) 10*fb5941c3SDon Lewisdiff -ur misc/Python-2.7.18/setup.py misc/build/Python-2.7.18/setup.py 11*fb5941c3SDon Lewis--- misc/Python-2.7.18/setup.py 2020-01-10 00:33:20.477509000 -0500 12*fb5941c3SDon Lewis+++ misc/build/Python-2.7.18/setup.py 2020-01-10 00:33:30.276902000 -0500 13e7d4ae22SPedro Giffuni@@ -854,7 +854,15 @@ 14c3dc64fbSPedro Giffuni depends=['socketmodule.h'], 15c3dc64fbSPedro Giffuni libraries=math_libs) ) 160a45483eSPedro Giffuni # Detect SSL support for the socket module (via _ssl) 170a45483eSPedro Giffuni+ UPDMINOR = os.environ.get('UPDMINOREXT') 180a45483eSPedro Giffuni+ ooosslinc = os.environ.get('SOLARVERSION') + '/' + \ 190a45483eSPedro Giffuni+ os.environ.get('INPATH') + '/' + \ 200a45483eSPedro Giffuni+ 'inc' 210a45483eSPedro Giffuni+ if UPDMINOR != None: 220a45483eSPedro Giffuni+ ooosslinc = ooosslinc + UPDMINOR 230a45483eSPedro Giffuni+ ooosslinc = ooosslinc + '/external/' 240a45483eSPedro Giffuni search_for_ssl_incs_in = [ 250a45483eSPedro Giffuni+ ooosslinc, 260a45483eSPedro Giffuni '/usr/local/ssl/include', 270a45483eSPedro Giffuni '/usr/contrib/ssl/include/' 280a45483eSPedro Giffuni ] 29e7d4ae22SPedro Giffuni@@ -866,8 +874,15 @@ 300a45483eSPedro Giffuni ['/usr/kerberos/include']) 310a45483eSPedro Giffuni if krb5_h: 320a45483eSPedro Giffuni ssl_incs += krb5_h 330a45483eSPedro Giffuni+ ooossllib = os.environ.get('SOLARVER') + '/' + \ 340a45483eSPedro Giffuni+ os.environ.get('INPATH') + '/' + \ 350a45483eSPedro Giffuni+ 'lib' 360a45483eSPedro Giffuni+ if UPDMINOR != None: 370a45483eSPedro Giffuni+ ooosslinc = ooosslinc + UPDMINOR 380a45483eSPedro Giffuni+ ooosslinc = ooosslinc + '/' 390a45483eSPedro Giffuni ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, 400a45483eSPedro Giffuni- ['/usr/local/ssl/lib', 410a45483eSPedro Giffuni+ [ooossllib, 420a45483eSPedro Giffuni+ '/usr/local/ssl/lib', 430a45483eSPedro Giffuni '/usr/contrib/ssl/lib/' 440a45483eSPedro Giffuni ] ) 450a45483eSPedro Giffuni 46