| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | $NetBSD: patch-am,v 1.16 2014/05/20 16:48:00 adam Exp $ | | 1 | $NetBSD: patch-am,v 1.17 2014/05/21 00:31:07 obache Exp $ |
2 | | | 2 | |
3 | Disabled modules for normal build: | | 3 | Disabled modules for normal build: |
4 | bsddb | | 4 | bsddb |
5 | curses | | 5 | curses |
6 | curses_panel | | 6 | curses_panel |
7 | elementtree | | 7 | elementtree |
8 | sqlite3 | | 8 | sqlite3 |
9 | tkinter | | 9 | tkinter |
10 | gdbm | | 10 | gdbm |
11 | pyexpat | | 11 | pyexpat |
12 | readline | | 12 | readline |
13 | {linux,oss,sun}audiodev | | 13 | {linux,oss,sun}audiodev |
14 | spwd | | 14 | spwd |
| @@ -53,47 +53,61 @@ cygwin 2.7.3-no-libm.patch | | | @@ -53,47 +53,61 @@ 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,8 +790,7 @@ class PyBuildExt(build_ext): | | 66 | @@ -785,11 +790,10 @@ 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 | search_for_ssl_incs_in | | 75 | - search_for_ssl_incs_in |
| | | 76 | + ssl_incs = find_file('openssl/ssl.h', [], |
| | | 77 | + search_for_ssl_incs_in + inc_dirs |
| | | 78 | ) |
| | | 79 | if ssl_incs is not None: |
| | | 80 | krb5_h = find_file('krb5.h', inc_dirs, |
76 | @@ -797,9 +801,7 @@ class PyBuildExt(build_ext): | | 81 | @@ -797,9 +801,7 @@ class PyBuildExt(build_ext): |
77 | if krb5_h: | | 82 | if krb5_h: |
78 | ssl_incs += krb5_h | | 83 | ssl_incs += krb5_h |
79 | ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, | | 84 | ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, |
80 | - ['/usr/local/ssl/lib', | | 85 | - ['/usr/local/ssl/lib', |
81 | - '/usr/contrib/ssl/lib/' | | 86 | - '/usr/contrib/ssl/lib/' |
82 | - ] ) | | 87 | - ] ) |
83 | + [] ) | | 88 | + [] ) |
84 | | | 89 | |
85 | if (ssl_incs is not None and | | 90 | if (ssl_incs is not None and |
86 | ssl_libs is not None): | | 91 | ssl_libs is not None): |
| | | 92 | @@ -818,7 +820,7 @@ class PyBuildExt(build_ext): |
| | | 93 | |
| | | 94 | # look for the openssl version header on the compiler search path. |
| | | 95 | opensslv_h = find_file('openssl/opensslv.h', [], |
| | | 96 | - inc_dirs + search_for_ssl_incs_in) |
| | | 97 | + search_for_ssl_incs_in + inc_dirs) |
| | | 98 | if opensslv_h: |
| | | 99 | name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') |
| | | 100 | if host_platform == 'darwin' and is_macosx_sdk_path(name): |
87 | @@ -918,175 +920,6 @@ class PyBuildExt(build_ext): | | 101 | @@ -918,175 +920,6 @@ class PyBuildExt(build_ext): |
88 | else: | | 102 | else: |
89 | raise ValueError("unknown major BerkeleyDB version", major) | | 103 | raise ValueError("unknown major BerkeleyDB version", major) |
90 | | | 104 | |
91 | - # construct a list of paths to look for the header file in on | | 105 | - # construct a list of paths to look for the header file in on |
92 | - # top of the normal inc_dirs. | | 106 | - # top of the normal inc_dirs. |
93 | - db_inc_paths = [ | | 107 | - db_inc_paths = [ |
94 | - '/usr/include/db4', | | 108 | - '/usr/include/db4', |
95 | - '/usr/local/include/db4', | | 109 | - '/usr/local/include/db4', |
96 | - '/opt/sfw/include/db4', | | 110 | - '/opt/sfw/include/db4', |
97 | - '/usr/include/db3', | | 111 | - '/usr/include/db3', |
98 | - '/usr/local/include/db3', | | 112 | - '/usr/local/include/db3', |
99 | - '/opt/sfw/include/db3', | | 113 | - '/opt/sfw/include/db3', |