Tue May 20 16:48:00 2014 UTC ()
Fix detecting OpenSSL, in particular on OS X.


(adam)
diff -r1.37 -r1.38 pkgsrc/lang/python27/distinfo
diff -r1.15 -r1.16 pkgsrc/lang/python27/patches/patch-am
cvs diff -r1.37 -r1.38 pkgsrc/lang/python27/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python27/distinfo 2014/05/10 08:38:04 1.37
+++ pkgsrc/lang/python27/distinfo 2014/05/20 16:48:00 1.38
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: distinfo,v 1.37 2014/05/10 08:38:04 obache Exp $ 1$NetBSD: distinfo,v 1.38 2014/05/20 16:48:00 adam Exp $
2 2
3SHA1 (Python-2.7.6.tar.xz) = 8321636af2acbeaa68fc635d7dda7369ed446a80 3SHA1 (Python-2.7.6.tar.xz) = 8321636af2acbeaa68fc635d7dda7369ed446a80
4RMD160 (Python-2.7.6.tar.xz) = 8efc73a01a466d8fa16c5c1734c89be79c2c538a 4RMD160 (Python-2.7.6.tar.xz) = 8efc73a01a466d8fa16c5c1734c89be79c2c538a
5Size (Python-2.7.6.tar.xz) = 10431288 bytes 5Size (Python-2.7.6.tar.xz) = 10431288 bytes
6SHA1 (patch-Include_node.h) = 673d148b625711ac47e4bfeb0f5b0d5b31f94d7e 6SHA1 (patch-Include_node.h) = 673d148b625711ac47e4bfeb0f5b0d5b31f94d7e
7SHA1 (patch-Include_pyerrors.h) = 3eba043c83b1d1df4918524f7b53047a6ed372ae 7SHA1 (patch-Include_pyerrors.h) = 3eba043c83b1d1df4918524f7b53047a6ed372ae
8SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063b4d5ea 8SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063b4d5ea
9SHA1 (patch-Modules___ssl.c) = aaddaea5bcd6c84d3d896c7c37f710933b8228bc 9SHA1 (patch-Modules___ssl.c) = aaddaea5bcd6c84d3d896c7c37f710933b8228bc
10SHA1 (patch-Modules_getpath.c) = f68b38eb90f974b67ceab3922ce7f92eb77f25c3 10SHA1 (patch-Modules_getpath.c) = f68b38eb90f974b67ceab3922ce7f92eb77f25c3
11SHA1 (patch-Modules_readline.c) = 0afcbd1c8bdf3648177bed760e6cccf54c857451 11SHA1 (patch-Modules_readline.c) = 0afcbd1c8bdf3648177bed760e6cccf54c857451
12SHA1 (patch-Modules_socketmodule.c) = a8a4da9381a9485f7e999ae7db4aa715adfacfa5 12SHA1 (patch-Modules_socketmodule.c) = a8a4da9381a9485f7e999ae7db4aa715adfacfa5
13SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa 13SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa
14SHA1 (patch-ab) = 0d0ae9802dfe3b85659adb16793affd8c4ffce43 14SHA1 (patch-ab) = 0d0ae9802dfe3b85659adb16793affd8c4ffce43
15SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec 15SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
16SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6 16SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
17SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139 17SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139
18SHA1 (patch-al) = dd8bed847f797b97df1a9ad7ffe17645b0f08925 18SHA1 (patch-al) = dd8bed847f797b97df1a9ad7ffe17645b0f08925
19SHA1 (patch-am) = 801c8fbe14be2138ef45f2d80646d8be6d4ea25a 19SHA1 (patch-am) = 4a1fb4f30d27463587901f5cf40adfc7b9c5904a
20SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca 20SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
21SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1 21SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1
22SHA1 (patch-au) = 2a2a988ac92553d17eb898870d1adb3c30a59b66 22SHA1 (patch-au) = 2a2a988ac92553d17eb898870d1adb3c30a59b66
23SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2 23SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2
24SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0 24SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0
25SHA1 (patch-ax) = be7498a37a89c86d278d07c38666237215308498 25SHA1 (patch-ax) = be7498a37a89c86d278d07c38666237215308498
26SHA1 (patch-az) = 56a3adedfc87cbbb0307ccb4b452665f79bde582 26SHA1 (patch-az) = 56a3adedfc87cbbb0307ccb4b452665f79bde582
27SHA1 (patch-pyconfig.h.in) = c4544178ecceffb6ed911df39d3a64bff665cb34 27SHA1 (patch-pyconfig.h.in) = c4544178ecceffb6ed911df39d3a64bff665cb34
28SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0 28SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0
cvs diff -r1.15 -r1.16 pkgsrc/lang/python27/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/lang/python27/patches/Attic/patch-am 2014/04/13 15:06:20 1.15
+++ pkgsrc/lang/python27/patches/Attic/patch-am 2014/05/20 16:48:00 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-am,v 1.15 2014/04/13 15:06:20 bsiegert Exp $ 1$NetBSD: patch-am,v 1.16 2014/05/20 16:48:00 adam Exp $
2 2
3Disabled modules for normal build: 3Disabled modules for normal build:
4bsddb 4bsddb
5curses 5curses
6curses_panel 6curses_panel
7elementtree 7elementtree
8sqlite3 8sqlite3
9tkinter 9tkinter
10gdbm 10gdbm
11pyexpat 11pyexpat
12readline 12readline
13{linux,oss,sun}audiodev 13{linux,oss,sun}audiodev
14spwd 14spwd
@@ -53,59 +53,47 @@ cygwin 2.7.3-no-libm.patch @@ -53,59 +53,47 @@ cygwin 2.7.3-no-libm.patch
53+ self.compiler.include_dirs.insert(0, incdir) 53+ self.compiler.include_dirs.insert(0, incdir)
54 if cross_compiling: 54 if cross_compiling:
55 self.add_gcc_paths() 55 self.add_gcc_paths()
56 self.add_multiarch_paths() 56 self.add_multiarch_paths()
57@@ -551,7 +556,7 @@ class PyBuildExt(build_ext): 57@@ -551,7 +556,7 @@ class PyBuildExt(build_ext):
58  58
59 # Check for MacOS X, which doesn't need libm.a at all 59 # Check for MacOS X, which doesn't need libm.a at all
60 math_libs = ['m'] 60 math_libs = ['m']
61- if host_platform in ['darwin', 'beos']: 61- if host_platform in ['darwin', 'beos']:
62+ if host_platform in ['darwin', 'beos', 'cygwin']: 62+ if host_platform in ['darwin', 'beos', 'cygwin']:
63 math_libs = [] 63 math_libs = []
64  64
65 # XXX Omitted modules: gl, pure, dl, SGI-specific modules 65 # XXX Omitted modules: gl, pure, dl, SGI-specific modules
66@@ -785,10 +790,9 @@ class PyBuildExt(build_ext): 66@@ -785,8 +790,7 @@ class PyBuildExt(build_ext):
67 libraries=math_libs) ) 67 libraries=math_libs) )
68 # Detect SSL support for the socket module (via _ssl) 68 # Detect SSL support for the socket module (via _ssl)
69 search_for_ssl_incs_in = [ 69 search_for_ssl_incs_in = [
70- '/usr/local/ssl/include', 70- '/usr/local/ssl/include',
71- '/usr/contrib/ssl/include/' 71- '/usr/contrib/ssl/include/'
72+ '@SSLBASE@/include' 72+ '@SSLBASE@/include'
73 ] 73 ]
74- ssl_incs = find_file('openssl/ssl.h', inc_dirs, 74 ssl_incs = find_file('openssl/ssl.h', inc_dirs,
75+ ssl_incs = find_file('openssl/ssl.h', [], 
76 search_for_ssl_incs_in 75 search_for_ssl_incs_in
77 ) 
78 if ssl_incs is not None: 
79@@ -797,9 +801,7 @@ class PyBuildExt(build_ext): 76@@ -797,9 +801,7 @@ class PyBuildExt(build_ext):
80 if krb5_h: 77 if krb5_h:
81 ssl_incs += krb5_h 78 ssl_incs += krb5_h
82 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, 79 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
83- ['/usr/local/ssl/lib', 80- ['/usr/local/ssl/lib',
84- '/usr/contrib/ssl/lib/' 81- '/usr/contrib/ssl/lib/'
85- ] ) 82- ] )
86+ [] ) 83+ [] )
87  84
88 if (ssl_incs is not None and 85 if (ssl_incs is not None and
89 ssl_libs is not None): 86 ssl_libs is not None):
90@@ -818,7 +820,7 @@ class PyBuildExt(build_ext): 
91  
92 # look for the openssl version header on the compiler search path. 
93 opensslv_h = find_file('openssl/opensslv.h', [], 
94- inc_dirs + search_for_ssl_incs_in) 
95+ search_for_ssl_incs_in) 
96 if opensslv_h: 
97 name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') 
98 if host_platform == 'darwin' and is_macosx_sdk_path(name): 
99@@ -918,175 +920,6 @@ class PyBuildExt(build_ext): 87@@ -918,175 +920,6 @@ class PyBuildExt(build_ext):
100 else: 88 else:
101 raise ValueError("unknown major BerkeleyDB version", major) 89 raise ValueError("unknown major BerkeleyDB version", major)
102  90
103- # construct a list of paths to look for the header file in on 91- # construct a list of paths to look for the header file in on
104- # top of the normal inc_dirs. 92- # top of the normal inc_dirs.
105- db_inc_paths = [ 93- db_inc_paths = [
106- '/usr/include/db4', 94- '/usr/include/db4',
107- '/usr/local/include/db4', 95- '/usr/local/include/db4',
108- '/opt/sfw/include/db4', 96- '/opt/sfw/include/db4',
109- '/usr/include/db3', 97- '/usr/include/db3',
110- '/usr/local/include/db3', 98- '/usr/local/include/db3',
111- '/opt/sfw/include/db3', 99- '/opt/sfw/include/db3',