Wed May 21 00:35:50 2014 UTC ()
try to find openssl header from system inc_dirs additionally, builtin one
may be in unusual location.


(obache)
diff -r1.58 -r1.59 pkgsrc/lang/python26/distinfo
diff -r1.23 -r1.24 pkgsrc/lang/python26/patches/patch-am
cvs diff -r1.58 -r1.59 pkgsrc/lang/python26/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python26/Attic/distinfo 2014/04/13 14:56:56 1.58
+++ pkgsrc/lang/python26/Attic/distinfo 2014/05/21 00:35:50 1.59
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: distinfo,v 1.58 2014/04/13 14:56:56 bsiegert Exp $ 1$NetBSD: distinfo,v 1.59 2014/05/21 00:35:50 obache Exp $
2 2
3SHA1 (Python-2.6.9.tar.xz) = 2fc159946dfcceffbe4a8638de32d0cd8059c2f8 3SHA1 (Python-2.6.9.tar.xz) = 2fc159946dfcceffbe4a8638de32d0cd8059c2f8
4RMD160 (Python-2.6.9.tar.xz) = 42edf7c9f2f64b77ab173de30ea453257c2c06b3 4RMD160 (Python-2.6.9.tar.xz) = 42edf7c9f2f64b77ab173de30ea453257c2c06b3
5Size (Python-2.6.9.tar.xz) = 9333664 bytes 5Size (Python-2.6.9.tar.xz) = 9333664 bytes
6SHA1 (patch-Lib_distutils_unixccompiler.py) = 1ce01fbe2d36cf0c7ce347c878cfe2d290ec8490 6SHA1 (patch-Lib_distutils_unixccompiler.py) = 1ce01fbe2d36cf0c7ce347c878cfe2d290ec8490
7SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94 7SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94
8SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d 8SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d
9SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365 9SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365
10SHA1 (patch-Modules_pyexpat.c) = 093f5abb50667e776c66564f4ec87addfdc05ff3 10SHA1 (patch-Modules_pyexpat.c) = 093f5abb50667e776c66564f4ec87addfdc05ff3
11SHA1 (patch-Modules_readline.c) = e72d8b3e6e96d34b45b1f5c440967ebad6d714c4 11SHA1 (patch-Modules_readline.c) = e72d8b3e6e96d34b45b1f5c440967ebad6d714c4
12SHA1 (patch-SA43463) = a0285ce9eb1d994bb05cd54812f3fc9cb678fe7f 12SHA1 (patch-SA43463) = a0285ce9eb1d994bb05cd54812f3fc9cb678fe7f
13SHA1 (patch-aa) = 0528fc5da76d5f1d19586ea3dda1acd09a4b0113 13SHA1 (patch-aa) = 0528fc5da76d5f1d19586ea3dda1acd09a4b0113
14SHA1 (patch-ab) = b47aa9d18a7c1a99ac8cc8b29c64867443f303e5 14SHA1 (patch-ab) = b47aa9d18a7c1a99ac8cc8b29c64867443f303e5
15SHA1 (patch-ac) = 57c88d47f82630e67bcd27ab61bf4362035da2f2 15SHA1 (patch-ac) = 57c88d47f82630e67bcd27ab61bf4362035da2f2
16SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b 16SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b
17SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9 17SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9
18SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147 18SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147
19SHA1 (patch-al) = 45dd16af8e7a45aa323138f712c034aa79a91019 19SHA1 (patch-al) = 45dd16af8e7a45aa323138f712c034aa79a91019
20SHA1 (patch-am) = 602726fb7f694c1cfe39691aef01fee1687befb1 20SHA1 (patch-am) = 216e4993a83b3ff1193c2ab524e761bc9ae3d52d
21SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab 21SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
22SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603 22SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603
23SHA1 (patch-ap) = 5ad6f248027be369bd27f69210ff3c7b97a297a2 23SHA1 (patch-ap) = 5ad6f248027be369bd27f69210ff3c7b97a297a2
24SHA1 (patch-au) = 230d74342997021e957105786e93600f5d03cf7b 24SHA1 (patch-au) = 230d74342997021e957105786e93600f5d03cf7b
25SHA1 (patch-av) = d6bf0419015656a8d2f13d3132873e453c8a6b6e 25SHA1 (patch-av) = d6bf0419015656a8d2f13d3132873e453c8a6b6e
26SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8 26SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8
27SHA1 (patch-ba) = 97dcf72d7380a2d257220669845c52a698165fcf 27SHA1 (patch-ba) = 97dcf72d7380a2d257220669845c52a698165fcf
28SHA1 (patch-bb) = 6cdd94dd1e69630159194c7c153b6c4e46c81456 28SHA1 (patch-bb) = 6cdd94dd1e69630159194c7c153b6c4e46c81456
29SHA1 (patch-bc) = 2a57949e0085ac3e8fe8ecd64ffb2b205f3862ac 29SHA1 (patch-bc) = 2a57949e0085ac3e8fe8ecd64ffb2b205f3862ac
30SHA1 (patch-pyconfig.h.in) = ad0f7d60886849e58a03fb28bb6c5ba0600c4698 30SHA1 (patch-pyconfig.h.in) = ad0f7d60886849e58a03fb28bb6c5ba0600c4698
31SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0 31SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0
cvs diff -r1.23 -r1.24 pkgsrc/lang/python26/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/lang/python26/patches/Attic/patch-am 2014/04/13 14:56:56 1.23
+++ pkgsrc/lang/python26/patches/Attic/patch-am 2014/05/21 00:35:50 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-am,v 1.23 2014/04/13 14:56:56 bsiegert Exp $ 1$NetBSD: patch-am,v 1.24 2014/05/21 00:35:50 obache 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
@@ -69,56 +69,58 @@ support building the "nis" and "crypt" m @@ -69,56 +69,58 @@ support building the "nis" and "crypt" m
69+ if os.environ.has_key('BUILDLINK_DIR'): 69+ if os.environ.has_key('BUILDLINK_DIR'):
70+ dir = os.environ['BUILDLINK_DIR'] 70+ dir = os.environ['BUILDLINK_DIR']
71+ libdir = dir + '/lib' 71+ libdir = dir + '/lib'
72+ incdir = dir + '/include' 72+ incdir = dir + '/include'
73+ if libdir not in self.compiler.library_dirs: 73+ if libdir not in self.compiler.library_dirs:
74+ self.compiler.library_dirs.insert(0, libdir) 74+ self.compiler.library_dirs.insert(0, libdir)
75+ if incdir not in self.compiler.include_dirs: 75+ if incdir not in self.compiler.include_dirs:
76+ self.compiler.include_dirs.insert(0, incdir) 76+ self.compiler.include_dirs.insert(0, incdir)
77+ 77+
78+ self.add_multiarch_paths() 78+ self.add_multiarch_paths()
79  79
80 # Add paths specified in the environment variables LDFLAGS and 80 # Add paths specified in the environment variables LDFLAGS and
81 # CPPFLAGS for header and library files. 81 # CPPFLAGS for header and library files.
82@@ -691,10 +721,9 @@ class PyBuildExt(build_ext): 82@@ -691,11 +721,10 @@ class PyBuildExt(build_ext):
83 depends = ['socketmodule.h']) ) 83 depends = ['socketmodule.h']) )
84 # Detect SSL support for the socket module (via _ssl) 84 # Detect SSL support for the socket module (via _ssl)
85 search_for_ssl_incs_in = [ 85 search_for_ssl_incs_in = [
86- '/usr/local/ssl/include', 86- '/usr/local/ssl/include',
87- '/usr/contrib/ssl/include/' 87- '/usr/contrib/ssl/include/'
88+ '@SSLBASE@/include' 88+ '@SSLBASE@/include'
89 ] 89 ]
90- ssl_incs = find_file('openssl/ssl.h', inc_dirs, 90- ssl_incs = find_file('openssl/ssl.h', inc_dirs,
 91- search_for_ssl_incs_in
91+ ssl_incs = find_file('openssl/ssl.h', [], 92+ ssl_incs = find_file('openssl/ssl.h', [],
92 search_for_ssl_incs_in 93+ search_for_ssl_incs_in + inc_dirs
93 ) 94 )
94 if ssl_incs is not None: 95 if ssl_incs is not None:
 96 krb5_h = find_file('krb5.h', inc_dirs,
95@@ -703,9 +732,7 @@ class PyBuildExt(build_ext): 97@@ -703,9 +732,7 @@ class PyBuildExt(build_ext):
96 if krb5_h: 98 if krb5_h:
97 ssl_incs += krb5_h 99 ssl_incs += krb5_h
98 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, 100 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
99- ['/usr/local/ssl/lib', 101- ['/usr/local/ssl/lib',
100- '/usr/contrib/ssl/lib/' 102- '/usr/contrib/ssl/lib/'
101- ] ) 103- ] )
102+ [] ) 104+ [] )
103  105
104 if (ssl_incs is not None and 106 if (ssl_incs is not None and
105 ssl_libs is not None): 107 ssl_libs is not None):
106@@ -724,7 +751,7 @@ class PyBuildExt(build_ext): 108@@ -724,7 +751,7 @@ class PyBuildExt(build_ext):
107  109
108 # look for the openssl version header on the compiler search path. 110 # look for the openssl version header on the compiler search path.
109 opensslv_h = find_file('openssl/opensslv.h', [], 111 opensslv_h = find_file('openssl/opensslv.h', [],
110- inc_dirs + search_for_ssl_incs_in) 112- inc_dirs + search_for_ssl_incs_in)
111+ search_for_ssl_incs_in) 113+ search_for_ssl_incs_in + inc_dirs)
112 if opensslv_h: 114 if opensslv_h:
113 name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') 115 name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
114 if sys.platform == 'darwin' and is_macosx_sdk_path(name): 116 if sys.platform == 'darwin' and is_macosx_sdk_path(name):
115@@ -815,172 +842,6 @@ class PyBuildExt(build_ext): 117@@ -815,172 +842,6 @@ class PyBuildExt(build_ext):
116 else: 118 else:
117 raise ValueError("unknown major BerkeleyDB version", major) 119 raise ValueError("unknown major BerkeleyDB version", major)
118  120
119- # construct a list of paths to look for the header file in on 121- # construct a list of paths to look for the header file in on
120- # top of the normal inc_dirs. 122- # top of the normal inc_dirs.
121- db_inc_paths = [ 123- db_inc_paths = [
122- '/usr/include/db4', 124- '/usr/include/db4',
123- '/usr/local/include/db4', 125- '/usr/local/include/db4',
124- '/opt/sfw/include/db4', 126- '/opt/sfw/include/db4',