xref: /aoo42x/main/python/python-ssl.patch (revision 0a45483e)
1diff -ru misc/Python-2.7.3/PCbuild/build_ssl.py misc/build/Python-2.7.3/PCbuild/build_ssl.py
2--- misc/Python-2.7.3/PCbuild/build_ssl.py	2012-04-09 18:07:35.000000000 -0500
3+++ misc/build/Python-2.7.3/PCbuild/build_ssl.py	2012-07-25 14:37:37.000000000 -0500
4@@ -253,4 +253,4 @@
5     sys.exit(rc)
6
7 if __name__=='__main__':
8-    main()
9+    sys.exit(0)
10diff -ru misc/Python-2.7.3/setup.py misc/build/Python-2.7.3/setup.py
11--- misc/Python-2.7.3/setup.py	2012-04-09 18:07:36.000000000 -0500
12+++ misc/build/Python-2.7.3/setup.py	2012-07-25 14:37:37.000000000 -0500
13@@ -702,7 +702,15 @@
14         exts.append( Extension('_socket', ['socketmodule.c'],
15                                depends = ['socketmodule.h']) )
16         # Detect SSL support for the socket module (via _ssl)
17+        UPDMINOR = os.environ.get('UPDMINOREXT')
18+        ooosslinc = os.environ.get('SOLARVERSION') + '/' + \
19+            os.environ.get('INPATH') + '/' + \
20+            'inc'
21+        if UPDMINOR != None:
22+            ooosslinc = ooosslinc + UPDMINOR
23+        ooosslinc = ooosslinc + '/external/'
24         search_for_ssl_incs_in = [
25+                              ooosslinc,
26                               '/usr/local/ssl/include',
27                               '/usr/contrib/ssl/include/'
28                              ]
29@@ -714,8 +722,15 @@
30                                ['/usr/kerberos/include'])
31             if krb5_h:
32                 ssl_incs += krb5_h
33+        ooossllib = os.environ.get('SOLARVER') + '/' + \
34+            os.environ.get('INPATH') + '/' + \
35+            'lib'
36+        if UPDMINOR != None:
37+            ooosslinc = ooosslinc + UPDMINOR
38+        ooosslinc = ooosslinc + '/'
39         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
40-                                     ['/usr/local/ssl/lib',
41+                                     [ooossllib,
42+                                      '/usr/local/ssl/lib',
43                                       '/usr/contrib/ssl/lib/'
44                                      ] )
45
46