Pullup ticket #4369 - requested by bsiegert lang/python26: build fix Revisions pulled up: - lang/python26/Makefile 1.63 - lang/python26/distinfo 1.58 - lang/python26/patches/patch-am 1.23 - lang/python27/Makefile 1.40 - lang/python27/distinfo 1.36 - lang/python27/patches/patch-am 1.15 --- Module Name: pkgsrc Committed By: bsiegert Date: Sun Apr 13 14:56:56 UTC 2014 Modified Files: pkgsrc/lang/python26: Makefile distinfo pkgsrc/lang/python26/patches: patch-am Log Message: Redo reverted commit from obache@. Original description: Prevent to detect unwanted builtin openssl. After bump of BUILDLINK_API_DEPENDS.openssl to 1.0.1c, buitin openssl is not acceptable for various platforms. --- Module Name: pkgsrc Committed By: bsiegert Date: Sun Apr 13 15:06:20 UTC 2014 Modified Files: pkgsrc/lang/python27: Makefile distinfo pkgsrc/lang/python27/patches: patch-am Log Message: Reapply reverted commit from obache@. Original description: Prevent to detect unwanted builtin openssl. After bump of BUILDLINK_API_DEPENDS.openssl to 1.0.1c, buitin openssl is not acceptable for various platforms.diff -r1.62 -r1.62.2.1 pkgsrc/lang/python26/Makefile
(tron)
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.62 2014/03/27 05:36:10 obache Exp $ | 1 | # $NetBSD: Makefile,v 1.62.2.1 2014/04/14 11:38:44 tron Exp $ | |
2 | 2 | |||
3 | .include "dist.mk" | 3 | .include "dist.mk" | |
4 | 4 | |||
5 | PKGREVISION= 3 | 5 | PKGREVISION= 3 | |
6 | 6 | |||
7 | PKGNAME= python26-${PY_DISTVERSION} | 7 | PKGNAME= python26-${PY_DISTVERSION} | |
8 | CATEGORIES= lang python | 8 | CATEGORIES= lang python | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://www.python.org/ | 11 | HOMEPAGE= http://www.python.org/ | |
12 | COMMENT= Interpreted, interactive, object-oriented programming language | 12 | COMMENT= Interpreted, interactive, object-oriented programming language | |
13 | LICENSE= python-software-foundation | 13 | LICENSE= python-software-foundation | |
14 | 14 | |||
@@ -145,26 +145,32 @@ TEST_TARGET= test | @@ -145,26 +145,32 @@ TEST_TARGET= test | |||
145 | INSTALL_TARGET= altinstall | 145 | INSTALL_TARGET= altinstall | |
146 | 146 | |||
147 | REPLACE_INTERPRETER+= py26 | 147 | REPLACE_INTERPRETER+= py26 | |
148 | REPLACE.py26.old= .*python[^ ]* | 148 | REPLACE.py26.old= .*python[^ ]* | |
149 | REPLACE.py26.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} | 149 | REPLACE.py26.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} | |
150 | REPLACE_FILES.py26= Lib/*.py Lib/*/*.py Lib/*/*/*.py | 150 | REPLACE_FILES.py26= Lib/*.py Lib/*/*.py Lib/*/*/*.py | |
151 | 151 | |||
152 | SUBST_CLASSES+= findlib | 152 | SUBST_CLASSES+= findlib | |
153 | SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin. | 153 | SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin. | |
154 | SUBST_STAGE.findlib= pre-configure | 154 | SUBST_STAGE.findlib= pre-configure | |
155 | SUBST_FILES.findlib= Lib/distutils/unixccompiler.py | 155 | SUBST_FILES.findlib= Lib/distutils/unixccompiler.py | |
156 | SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},' | 156 | SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},' | |
157 | 157 | |||
158 | SUBST_CLASSES+= sslbase | |||
159 | SUBST_MESSAGE.sslbase= Fixing find-file for openssl with SSLBASE. | |||
160 | SUBST_STAGE.sslbase= pre-configure | |||
161 | SUBST_FILES.sslbase= setup.py | |||
162 | SUBST_VARS.sslbase= SSLBASE | |||
163 | ||||
158 | post-extract: | 164 | post-extract: | |
159 | ${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py | 165 | ${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py | |
160 | ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} | 166 | ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} | |
161 | ${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX} | 167 | ${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX} | |
162 | 168 | |||
163 | .if ${OPSYS} == "HPUX" | 169 | .if ${OPSYS} == "HPUX" | |
164 | post-install: | 170 | post-install: | |
165 | ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.6.sl \ | 171 | ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.6.sl \ | |
166 | ${DESTDIR}${PREFIX}/lib/libpython2.6.sl.1.0 | 172 | ${DESTDIR}${PREFIX}/lib/libpython2.6.sl.1.0 | |
167 | .endif | 173 | .endif | |
168 | 174 | |||
169 | BUILDLINK_DEPMETHOD.readline= build | 175 | BUILDLINK_DEPMETHOD.readline= build | |
170 | 176 |
@@ -1,31 +1,31 @@ | @@ -1,31 +1,31 @@ | |||
1 | $NetBSD: distinfo,v 1.57 2014/03/27 06:14:57 obache Exp $ | 1 | $NetBSD: distinfo,v 1.57.2.1 2014/04/14 11:38:44 tron Exp $ | |
2 | 2 | |||
3 | SHA1 (Python-2.6.9.tar.xz) = 2fc159946dfcceffbe4a8638de32d0cd8059c2f8 | 3 | SHA1 (Python-2.6.9.tar.xz) = 2fc159946dfcceffbe4a8638de32d0cd8059c2f8 | |
4 | RMD160 (Python-2.6.9.tar.xz) = 42edf7c9f2f64b77ab173de30ea453257c2c06b3 | 4 | RMD160 (Python-2.6.9.tar.xz) = 42edf7c9f2f64b77ab173de30ea453257c2c06b3 | |
5 | Size (Python-2.6.9.tar.xz) = 9333664 bytes | 5 | Size (Python-2.6.9.tar.xz) = 9333664 bytes | |
6 | SHA1 (patch-Lib_distutils_unixccompiler.py) = 1ce01fbe2d36cf0c7ce347c878cfe2d290ec8490 | 6 | SHA1 (patch-Lib_distutils_unixccompiler.py) = 1ce01fbe2d36cf0c7ce347c878cfe2d290ec8490 | |
7 | SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94 | 7 | SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94 | |
8 | SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d | 8 | SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d | |
9 | SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365 | 9 | SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365 | |
10 | SHA1 (patch-Modules_pyexpat.c) = 093f5abb50667e776c66564f4ec87addfdc05ff3 | 10 | SHA1 (patch-Modules_pyexpat.c) = 093f5abb50667e776c66564f4ec87addfdc05ff3 | |
11 | SHA1 (patch-Modules_readline.c) = e72d8b3e6e96d34b45b1f5c440967ebad6d714c4 | 11 | SHA1 (patch-Modules_readline.c) = e72d8b3e6e96d34b45b1f5c440967ebad6d714c4 | |
12 | SHA1 (patch-SA43463) = a0285ce9eb1d994bb05cd54812f3fc9cb678fe7f | 12 | SHA1 (patch-SA43463) = a0285ce9eb1d994bb05cd54812f3fc9cb678fe7f | |
13 | SHA1 (patch-aa) = 0528fc5da76d5f1d19586ea3dda1acd09a4b0113 | 13 | SHA1 (patch-aa) = 0528fc5da76d5f1d19586ea3dda1acd09a4b0113 | |
14 | SHA1 (patch-ab) = b47aa9d18a7c1a99ac8cc8b29c64867443f303e5 | 14 | SHA1 (patch-ab) = b47aa9d18a7c1a99ac8cc8b29c64867443f303e5 | |
15 | SHA1 (patch-ac) = 57c88d47f82630e67bcd27ab61bf4362035da2f2 | 15 | SHA1 (patch-ac) = 57c88d47f82630e67bcd27ab61bf4362035da2f2 | |
16 | SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b | 16 | SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b | |
17 | SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9 | 17 | SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9 | |
18 | SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147 | 18 | SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147 | |
19 | SHA1 (patch-al) = 45dd16af8e7a45aa323138f712c034aa79a91019 | 19 | SHA1 (patch-al) = 45dd16af8e7a45aa323138f712c034aa79a91019 | |
20 | SHA1 (patch-am) = 4064aa3cbe34389ce344d7372eb71c7305f38e07 | 20 | SHA1 (patch-am) = 602726fb7f694c1cfe39691aef01fee1687befb1 | |
21 | SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab | 21 | SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab | |
22 | SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603 | 22 | SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603 | |
23 | SHA1 (patch-ap) = 5ad6f248027be369bd27f69210ff3c7b97a297a2 | 23 | SHA1 (patch-ap) = 5ad6f248027be369bd27f69210ff3c7b97a297a2 | |
24 | SHA1 (patch-au) = 230d74342997021e957105786e93600f5d03cf7b | 24 | SHA1 (patch-au) = 230d74342997021e957105786e93600f5d03cf7b | |
25 | SHA1 (patch-av) = d6bf0419015656a8d2f13d3132873e453c8a6b6e | 25 | SHA1 (patch-av) = d6bf0419015656a8d2f13d3132873e453c8a6b6e | |
26 | SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8 | 26 | SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8 | |
27 | SHA1 (patch-ba) = 97dcf72d7380a2d257220669845c52a698165fcf | 27 | SHA1 (patch-ba) = 97dcf72d7380a2d257220669845c52a698165fcf | |
28 | SHA1 (patch-bb) = 6cdd94dd1e69630159194c7c153b6c4e46c81456 | 28 | SHA1 (patch-bb) = 6cdd94dd1e69630159194c7c153b6c4e46c81456 | |
29 | SHA1 (patch-bc) = 2a57949e0085ac3e8fe8ecd64ffb2b205f3862ac | 29 | SHA1 (patch-bc) = 2a57949e0085ac3e8fe8ecd64ffb2b205f3862ac | |
30 | SHA1 (patch-pyconfig.h.in) = ad0f7d60886849e58a03fb28bb6c5ba0600c4698 | 30 | SHA1 (patch-pyconfig.h.in) = ad0f7d60886849e58a03fb28bb6c5ba0600c4698 | |
31 | SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0 | 31 | SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0 |
@@ -1,49 +1,51 @@ | @@ -1,49 +1,51 @@ | |||
1 | $NetBSD: patch-am,v 1.22 2014/03/27 05:36:10 obache Exp $ | 1 | $NetBSD: patch-am,v 1.22.2.1 2014/04/14 11:38:44 tron 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 | |
15 | Those have separate packages where needed. | 15 | Those have separate packages where needed. | |
16 | 16 | |||
17 | Only check the BUILDLINK_DIR for libraries etc, do not pick up random | 17 | Only check the BUILDLINK_DIR for libraries etc, do not pick up random | |
18 | headers and libraries from the system. | 18 | headers and libraries from the system. | |
19 | 19 | |||
20 | Build the _ssl module with pkgsrc choiced OpenSSL. | |||
21 | ||||
20 | Build the 1.85 compat module all the time against the BDB version of choice. | 22 | Build the 1.85 compat module all the time against the BDB version of choice. | |
21 | 23 | |||
22 | Add in Debian multiarch support (retrofitted from Python 2.7.2) to | 24 | Add in Debian multiarch support (retrofitted from Python 2.7.2) to | |
23 | support building the "nis" and "crypt" modules. | 25 | support building the "nis" and "crypt" modules. | |
24 | 26 | |||
25 | --- setup.py 2010-07-18 00:31:09.000000000 +1200 | 27 | --- setup.py.orig 2013-10-29 15:04:39.000000000 +0000 | |
26 | +++ setup.py 2011-09-23 01:51:17.757519638 +1200 | 28 | +++ setup.py | |
27 | @@ -18,7 +18,7 @@ | 29 | @@ -18,7 +18,7 @@ from distutils.command.install_lib impor | |
28 | from distutils.spawn import find_executable | 30 | from distutils.spawn import find_executable | |
29 | 31 | |||
30 | # This global variable is used to hold the list of modules to be disabled. | 32 | # This global variable is used to hold the list of modules to be disabled. | |
31 | -disabled_module_list = [] | 33 | -disabled_module_list = [] | |
32 | +disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline", "linuxaudiodev", "ossaudiodev", "spwd", "sunaudiodev"] | 34 | +disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline", "linuxaudiodev", "ossaudiodev", "spwd", "sunaudiodev"] | |
33 | 35 | |||
34 | def add_dir_to_list(dirlist, dir): | 36 | def add_dir_to_list(dirlist, dir): | |
35 | """Add the directory 'dir' to the list 'dirlist' (at the front) if | 37 | """Add the directory 'dir' to the list 'dirlist' (at the front) if | |
36 | @@ -354,10 +354,40 @@ | 38 | @@ -354,10 +354,40 @@ class PyBuildExt(build_ext): | |
37 | return platform | 39 | return platform | |
38 | return sys.platform | 40 | return sys.platform | |
39 | 41 | |||
40 | + def add_multiarch_paths(self): | 42 | + def add_multiarch_paths(self): | |
41 | + # Debian/Ubuntu multiarch support. | 43 | + # Debian/Ubuntu multiarch support. | |
42 | + # https://wiki.ubuntu.com/MultiarchSpec | 44 | + # https://wiki.ubuntu.com/MultiarchSpec | |
43 | + if not find_executable('dpkg-architecture'): | 45 | + if not find_executable('dpkg-architecture'): | |
44 | + return | 46 | + return | |
45 | + tmpfile = os.path.join(self.build_temp, 'multiarch') | 47 | + tmpfile = os.path.join(self.build_temp, 'multiarch') | |
46 | + if not os.path.exists(self.build_temp): | 48 | + if not os.path.exists(self.build_temp): | |
47 | + os.makedirs(self.build_temp) | 49 | + os.makedirs(self.build_temp) | |
48 | + ret = os.system( | 50 | + ret = os.system( | |
49 | + 'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' % | 51 | + 'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' % | |
@@ -67,38 +69,60 @@ support building the "nis" and "crypt" m | @@ -67,38 +69,60 @@ support building the "nis" and "crypt" m | |||
67 | + if os.environ.has_key('BUILDLINK_DIR'): | 69 | + if os.environ.has_key('BUILDLINK_DIR'): | |
68 | + dir = os.environ['BUILDLINK_DIR'] | 70 | + dir = os.environ['BUILDLINK_DIR'] | |
69 | + libdir = dir + '/lib' | 71 | + libdir = dir + '/lib' | |
70 | + incdir = dir + '/include' | 72 | + incdir = dir + '/include' | |
71 | + if libdir not in self.compiler.library_dirs: | 73 | + if libdir not in self.compiler.library_dirs: | |
72 | + self.compiler.library_dirs.insert(0, libdir) | 74 | + self.compiler.library_dirs.insert(0, libdir) | |
73 | + if incdir not in self.compiler.include_dirs: | 75 | + if incdir not in self.compiler.include_dirs: | |
74 | + self.compiler.include_dirs.insert(0, incdir) | 76 | + self.compiler.include_dirs.insert(0, incdir) | |
75 | + | 77 | + | |
76 | + self.add_multiarch_paths() | 78 | + self.add_multiarch_paths() | |
77 | 79 | |||
78 | # Add paths specified in the environment variables LDFLAGS and | 80 | # Add paths specified in the environment variables LDFLAGS and | |
79 | # CPPFLAGS for header and library files. | 81 | # CPPFLAGS for header and library files. | |
80 | @@ -703,9 +733,7 @@ | 82 | @@ -691,10 +721,9 @@ class PyBuildExt(build_ext): | |
83 | depends = ['socketmodule.h']) ) | |||
84 | # Detect SSL support for the socket module (via _ssl) | |||
85 | search_for_ssl_incs_in = [ | |||
86 | - '/usr/local/ssl/include', | |||
87 | - '/usr/contrib/ssl/include/' | |||
88 | + '@SSLBASE@/include' | |||
89 | ] | |||
90 | - ssl_incs = find_file('openssl/ssl.h', inc_dirs, | |||
91 | + ssl_incs = find_file('openssl/ssl.h', [], | |||
92 | search_for_ssl_incs_in | |||
93 | ) | |||
94 | if ssl_incs is not None: | |||
95 | @@ -703,9 +732,7 @@ class PyBuildExt(build_ext): | |||
81 | if krb5_h: | 96 | if krb5_h: | |
82 | ssl_incs += krb5_h | 97 | ssl_incs += krb5_h | |
83 | ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, | 98 | ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, | |
84 | - ['/usr/local/ssl/lib', | 99 | - ['/usr/local/ssl/lib', | |
85 | - '/usr/contrib/ssl/lib/' | 100 | - '/usr/contrib/ssl/lib/' | |
86 | - ] ) | 101 | - ] ) | |
87 | + [] ) | 102 | + [] ) | |
88 | 103 | |||
89 | if (ssl_incs is not None and | 104 | if (ssl_incs is not None and | |
90 | ssl_libs is not None): | 105 | ssl_libs is not None): | |
91 | @@ -815,172 +843,6 @@ | 106 | @@ -724,7 +751,7 @@ class PyBuildExt(build_ext): | |
107 | ||||
108 | # look for the openssl version header on the compiler search path. | |||
109 | opensslv_h = find_file('openssl/opensslv.h', [], | |||
110 | - inc_dirs + search_for_ssl_incs_in) | |||
111 | + search_for_ssl_incs_in) | |||
112 | if opensslv_h: | |||
113 | name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') | |||
114 | if sys.platform == 'darwin' and is_macosx_sdk_path(name): | |||
115 | @@ -815,172 +842,6 @@ class PyBuildExt(build_ext): | |||
92 | else: | 116 | else: | |
93 | raise ValueError("unknown major BerkeleyDB version", major) | 117 | raise ValueError("unknown major BerkeleyDB version", major) | |
94 | 118 | |||
95 | - # construct a list of paths to look for the header file in on | 119 | - # construct a list of paths to look for the header file in on | |
96 | - # top of the normal inc_dirs. | 120 | - # top of the normal inc_dirs. | |
97 | - db_inc_paths = [ | 121 | - db_inc_paths = [ | |
98 | - '/usr/include/db4', | 122 | - '/usr/include/db4', | |
99 | - '/usr/local/include/db4', | 123 | - '/usr/local/include/db4', | |
100 | - '/opt/sfw/include/db4', | 124 | - '/opt/sfw/include/db4', | |
101 | - '/usr/include/db3', | 125 | - '/usr/include/db3', | |
102 | - '/usr/local/include/db3', | 126 | - '/usr/local/include/db3', | |
103 | - '/opt/sfw/include/db3', | 127 | - '/opt/sfw/include/db3', | |
104 | - # Fink defaults (http://fink.sourceforge.net/) | 128 | - # Fink defaults (http://fink.sourceforge.net/) | |
@@ -251,27 +275,27 @@ support building the "nis" and "crypt" m | @@ -251,27 +275,27 @@ support building the "nis" and "crypt" m | |||
251 | - runtime_library_dirs=dblib_dir, | 275 | - runtime_library_dirs=dblib_dir, | |
252 | - include_dirs=db_incs, | 276 | - include_dirs=db_incs, | |
253 | - libraries=dblibs)) | 277 | - libraries=dblibs)) | |
254 | - else: | 278 | - else: | |
255 | - if db_setup_debug: print "db: no appropriate library found" | 279 | - if db_setup_debug: print "db: no appropriate library found" | |
256 | - db_incs = None | 280 | - db_incs = None | |
257 | - dblibs = [] | 281 | - dblibs = [] | |
258 | - dblib_dir = None | 282 | - dblib_dir = None | |
259 | - missing.append('_bsddb') | 283 | - missing.append('_bsddb') | |
260 | - | 284 | - | |
261 | # The sqlite interface | 285 | # The sqlite interface | |
262 | sqlite_setup_debug = False # verbose debug prints from this script? | 286 | sqlite_setup_debug = False # verbose debug prints from this script? | |
263 | 287 | |||
264 | @@ -1094,35 +956,40 @@ | 288 | @@ -1094,35 +955,40 @@ class PyBuildExt(build_ext): | |
265 | # we do not build this one. Otherwise this build will pick up | 289 | # we do not build this one. Otherwise this build will pick up | |
266 | # the more recent berkeleydb's db.h file first in the include path | 290 | # the more recent berkeleydb's db.h file first in the include path | |
267 | # when attempting to compile and it will fail. | 291 | # when attempting to compile and it will fail. | |
268 | - f = "/usr/include/db.h" | 292 | - f = "/usr/include/db.h" | |
269 | - | 293 | - | |
270 | - if sys.platform == 'darwin': | 294 | - if sys.platform == 'darwin': | |
271 | - if is_macosx_sdk_path(f): | 295 | - if is_macosx_sdk_path(f): | |
272 | - sysroot = macosx_sdk_root() | 296 | - sysroot = macosx_sdk_root() | |
273 | - f = os.path.join(sysroot, f[1:]) | 297 | - f = os.path.join(sysroot, f[1:]) | |
274 | - | 298 | - | |
275 | - if os.path.exists(f) and not db_incs: | 299 | - if os.path.exists(f) and not db_incs: | |
276 | - data = open(f).read() | 300 | - data = open(f).read() | |
277 | - m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) | 301 | - m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) | |
@@ -317,68 +341,68 @@ support building the "nis" and "crypt" m | @@ -317,68 +341,68 @@ support building the "nis" and "crypt" m | |||
317 | + line = input.readline() | 341 | + line = input.readline() | |
318 | + if not line: break | 342 | + if not line: break | |
319 | + if re.search('This file is part of GDBM', line): | 343 | + if re.search('This file is part of GDBM', line): | |
320 | + ret = None | 344 | + ret = None | |
321 | + break | 345 | + break | |
322 | + input.close() | 346 | + input.close() | |
323 | + break | 347 | + break | |
324 | + return ret | 348 | + return ret | |
325 | + | 349 | + | |
326 | + if find_ndbm_h(inc_dirs) is not None: | 350 | + if find_ndbm_h(inc_dirs) is not None: | |
327 | # Some systems have -lndbm, others don't | 351 | # Some systems have -lndbm, others don't | |
328 | if self.compiler.find_library_file(lib_dirs, 'ndbm'): | 352 | if self.compiler.find_library_file(lib_dirs, 'ndbm'): | |
329 | ndbm_libs = ['ndbm'] | 353 | ndbm_libs = ['ndbm'] | |
330 | @@ -1131,7 +998,7 @@ | 354 | @@ -1131,7 +997,7 @@ class PyBuildExt(build_ext): | |
331 | exts.append( Extension('dbm', ['dbmmodule.c'], | 355 | exts.append( Extension('dbm', ['dbmmodule.c'], | |
332 | define_macros=[('HAVE_NDBM_H',None)], | 356 | define_macros=[('HAVE_NDBM_H',None)], | |
333 | libraries = ndbm_libs ) ) | 357 | libraries = ndbm_libs ) ) | |
334 | - elif self.compiler.find_library_file(lib_dirs, 'gdbm'): | 358 | - elif self.compiler.find_library_file(lib_dirs, 'gdbm'): | |
335 | + elif 1==0 and self.compiler.find_library_file(lib_dirs, 'gdbm'): | 359 | + elif 1==0 and self.compiler.find_library_file(lib_dirs, 'gdbm'): | |
336 | gdbm_libs = ['gdbm'] | 360 | gdbm_libs = ['gdbm'] | |
337 | if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'): | 361 | if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'): | |
338 | gdbm_libs.append('gdbm_compat') | 362 | gdbm_libs.append('gdbm_compat') | |
339 | @@ -1147,14 +1014,12 @@ | 363 | @@ -1147,14 +1013,12 @@ class PyBuildExt(build_ext): | |
340 | libraries = gdbm_libs ) ) | 364 | libraries = gdbm_libs ) ) | |
341 | else: | 365 | else: | |
342 | missing.append('dbm') | 366 | missing.append('dbm') | |
343 | - elif db_incs is not None: | 367 | - elif db_incs is not None: | |
344 | + | 368 | + | |
345 | + if not module_enabled(exts, 'dbm'): | 369 | + if not module_enabled(exts, 'dbm'): | |
346 | exts.append( Extension('dbm', ['dbmmodule.c'], | 370 | exts.append( Extension('dbm', ['dbmmodule.c'], | |
347 | - library_dirs=dblib_dir, | 371 | - library_dirs=dblib_dir, | |
348 | - runtime_library_dirs=dblib_dir, | 372 | - runtime_library_dirs=dblib_dir, | |
349 | - include_dirs=db_incs, | 373 | - include_dirs=db_incs, | |
350 | define_macros=[('HAVE_BERKDB_H',None), | 374 | define_macros=[('HAVE_BERKDB_H',None), | |
351 | ('DB_DBM_HSEARCH',None)], | 375 | ('DB_DBM_HSEARCH',None)], | |
352 | - libraries=dblibs)) | 376 | - libraries=dblibs)) | |
353 | + libraries=["db"])) | 377 | + libraries=["db"])) | |
354 | else: | 378 | else: | |
355 | missing.append('dbm') | 379 | missing.append('dbm') | |
356 | 380 | |||
357 | @@ -1408,6 +1273,14 @@ | 381 | @@ -1408,6 +1272,14 @@ class PyBuildExt(build_ext): | |
358 | ) | 382 | ) | |
359 | libraries = [] | 383 | libraries = [] | |
360 | 384 | |||
361 | + elif platform.startswith('dragonfly'): | 385 | + elif platform.startswith('dragonfly'): | |
362 | + macros = dict( | 386 | + macros = dict( | |
363 | + HAVE_SEM_OPEN=0, | 387 | + HAVE_SEM_OPEN=0, | |
364 | + HAVE_SEM_TIMEDWAIT=0, | 388 | + HAVE_SEM_TIMEDWAIT=0, | |
365 | + HAVE_FD_TRANSFER=1, | 389 | + HAVE_FD_TRANSFER=1, | |
366 | + ) | 390 | + ) | |
367 | + libraries = [] | 391 | + libraries = [] | |
368 | + | 392 | + | |
369 | else: # Linux and other unices | 393 | else: # Linux and other unices | |
370 | macros = dict( | 394 | macros = dict( | |
371 | HAVE_SEM_OPEN=1, | 395 | HAVE_SEM_OPEN=1, | |
372 | @@ -2026,9 +1899,9 @@ | 396 | @@ -2026,9 +1898,9 @@ def main(): | |
373 | ext_modules=[Extension('_struct', ['_struct.c'])], | 397 | ext_modules=[Extension('_struct', ['_struct.c'])], | |
374 | 398 | |||
375 | # Scripts to install | 399 | # Scripts to install | |
376 | - scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', | 400 | - scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', | |
377 | - 'Tools/scripts/2to3', | 401 | - 'Tools/scripts/2to3', | |
378 | - 'Lib/smtpd.py'] | 402 | - 'Lib/smtpd.py'] | |
379 | + scripts = ['Tools/scripts/pydoc2.6', | 403 | + scripts = ['Tools/scripts/pydoc2.6', | |
380 | + 'Tools/scripts/2to3-2.6', | 404 | + 'Tools/scripts/2to3-2.6', | |
381 | + 'Tools/scripts/smtpd2.6.py'] | 405 | + 'Tools/scripts/smtpd2.6.py'] | |
382 | ) | 406 | ) | |
383 | 407 | |||
384 | # --install-platlib | 408 | # --install-platlib |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.39 2014/03/27 05:36:37 obache Exp $ | 1 | # $NetBSD: Makefile,v 1.39.2.1 2014/04/14 11:38:44 tron Exp $ | |
2 | 2 | |||
3 | .include "dist.mk" | 3 | .include "dist.mk" | |
4 | 4 | |||
5 | PKGNAME= python27-${PY_DISTVERSION} | 5 | PKGNAME= python27-${PY_DISTVERSION} | |
6 | PKGREVISION= 3 | 6 | PKGREVISION= 3 | |
7 | CATEGORIES= lang python | 7 | CATEGORIES= lang python | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://www.python.org/ | 10 | HOMEPAGE= http://www.python.org/ | |
11 | COMMENT= Interpreted, interactive, object-oriented programming language | 11 | COMMENT= Interpreted, interactive, object-oriented programming language | |
12 | LICENSE= python-software-foundation | 12 | LICENSE= python-software-foundation | |
13 | 13 | |||
14 | CONFLICTS+= python-[0-9]* | 14 | CONFLICTS+= python-[0-9]* | |
@@ -152,26 +152,32 @@ INSTALL_TARGET= altinstall | @@ -152,26 +152,32 @@ INSTALL_TARGET= altinstall | |||
152 | 152 | |||
153 | REPLACE_INTERPRETER+= py27 | 153 | REPLACE_INTERPRETER+= py27 | |
154 | REPLACE.py27.old= .*python[^ ]* | 154 | REPLACE.py27.old= .*python[^ ]* | |
155 | REPLACE.py27.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} | 155 | REPLACE.py27.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} | |
156 | REPLACE_FILES.py27= Lib/*.py Lib/*/*.py Lib/*/*/*.py | 156 | REPLACE_FILES.py27= Lib/*.py Lib/*/*.py Lib/*/*/*.py | |
157 | REPLACE_FILES.py27+= Lib/*/*/*/*.py | 157 | REPLACE_FILES.py27+= Lib/*/*/*/*.py | |
158 | 158 | |||
159 | SUBST_CLASSES+= findlib | 159 | SUBST_CLASSES+= findlib | |
160 | SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin. | 160 | SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin. | |
161 | SUBST_STAGE.findlib= pre-configure | 161 | SUBST_STAGE.findlib= pre-configure | |
162 | SUBST_FILES.findlib= Lib/distutils/unixccompiler.py | 162 | SUBST_FILES.findlib= Lib/distutils/unixccompiler.py | |
163 | SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},' | 163 | SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},' | |
164 | 164 | |||
165 | SUBST_CLASSES+= sslbase | |||
166 | SUBST_MESSAGE.sslbase= Fixing find-file for openssl with SSLBASE. | |||
167 | SUBST_STAGE.sslbase= pre-configure | |||
168 | SUBST_FILES.sslbase= setup.py | |||
169 | SUBST_VARS.sslbase= SSLBASE | |||
170 | ||||
165 | post-extract: | 171 | post-extract: | |
166 | ${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py | 172 | ${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py | |
167 | ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} | 173 | ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} | |
168 | ${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX} | 174 | ${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX} | |
169 | 175 | |||
170 | .if ${OPSYS} == "HPUX" | 176 | .if ${OPSYS} == "HPUX" | |
171 | post-install: | 177 | post-install: | |
172 | ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.7.sl \ | 178 | ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.7.sl \ | |
173 | ${DESTDIR}${PREFIX}/lib/libpython2.7.sl.1.0 | 179 | ${DESTDIR}${PREFIX}/lib/libpython2.7.sl.1.0 | |
174 | .endif | 180 | .endif | |
175 | 181 | |||
176 | BUILDLINK_DEPMETHOD.readline= build | 182 | BUILDLINK_DEPMETHOD.readline= build | |
177 | 183 |
@@ -1,28 +1,28 @@ | @@ -1,28 +1,28 @@ | |||
1 | $NetBSD: distinfo,v 1.35 2014/03/27 06:26:24 obache Exp $ | 1 | $NetBSD: distinfo,v 1.35.2.1 2014/04/14 11:38:44 tron Exp $ | |
2 | 2 | |||
3 | SHA1 (Python-2.7.6.tar.xz) = 8321636af2acbeaa68fc635d7dda7369ed446a80 | 3 | SHA1 (Python-2.7.6.tar.xz) = 8321636af2acbeaa68fc635d7dda7369ed446a80 | |
4 | RMD160 (Python-2.7.6.tar.xz) = 8efc73a01a466d8fa16c5c1734c89be79c2c538a | 4 | RMD160 (Python-2.7.6.tar.xz) = 8efc73a01a466d8fa16c5c1734c89be79c2c538a | |
5 | Size (Python-2.7.6.tar.xz) = 10431288 bytes | 5 | Size (Python-2.7.6.tar.xz) = 10431288 bytes | |
6 | SHA1 (patch-Include_node.h) = 673d148b625711ac47e4bfeb0f5b0d5b31f94d7e | 6 | SHA1 (patch-Include_node.h) = 673d148b625711ac47e4bfeb0f5b0d5b31f94d7e | |
7 | SHA1 (patch-Include_pyerrors.h) = 3eba043c83b1d1df4918524f7b53047a6ed372ae | 7 | SHA1 (patch-Include_pyerrors.h) = 3eba043c83b1d1df4918524f7b53047a6ed372ae | |
8 | SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063b4d5ea | 8 | SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063b4d5ea | |
9 | SHA1 (patch-Modules___ssl.c) = aaddaea5bcd6c84d3d896c7c37f710933b8228bc | 9 | SHA1 (patch-Modules___ssl.c) = aaddaea5bcd6c84d3d896c7c37f710933b8228bc | |
10 | SHA1 (patch-Modules_getpath.c) = f68b38eb90f974b67ceab3922ce7f92eb77f25c3 | 10 | SHA1 (patch-Modules_getpath.c) = f68b38eb90f974b67ceab3922ce7f92eb77f25c3 | |
11 | SHA1 (patch-Modules_readline.c) = 0afcbd1c8bdf3648177bed760e6cccf54c857451 | 11 | SHA1 (patch-Modules_readline.c) = 0afcbd1c8bdf3648177bed760e6cccf54c857451 | |
12 | SHA1 (patch-Modules_socketmodule.c) = 07c76dcf6dc8605446bc8e01d80e1f1e30a5ebf7 | 12 | SHA1 (patch-Modules_socketmodule.c) = 07c76dcf6dc8605446bc8e01d80e1f1e30a5ebf7 | |
13 | SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa | 13 | SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa | |
14 | SHA1 (patch-ab) = 0d0ae9802dfe3b85659adb16793affd8c4ffce43 | 14 | SHA1 (patch-ab) = 0d0ae9802dfe3b85659adb16793affd8c4ffce43 | |
15 | SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec | 15 | SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec | |
16 | SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6 | 16 | SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6 | |
17 | SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139 | 17 | SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139 | |
18 | SHA1 (patch-al) = dd8bed847f797b97df1a9ad7ffe17645b0f08925 | 18 | SHA1 (patch-al) = dd8bed847f797b97df1a9ad7ffe17645b0f08925 | |
19 | SHA1 (patch-am) = e5d78bfd5b9e6339985ed4cb587897042b6b8590 | 19 | SHA1 (patch-am) = 801c8fbe14be2138ef45f2d80646d8be6d4ea25a | |
20 | SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca | 20 | SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca | |
21 | SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1 | 21 | SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1 | |
22 | SHA1 (patch-au) = 2a2a988ac92553d17eb898870d1adb3c30a59b66 | 22 | SHA1 (patch-au) = 2a2a988ac92553d17eb898870d1adb3c30a59b66 | |
23 | SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2 | 23 | SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2 | |
24 | SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0 | 24 | SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0 | |
25 | SHA1 (patch-ax) = be7498a37a89c86d278d07c38666237215308498 | 25 | SHA1 (patch-ax) = be7498a37a89c86d278d07c38666237215308498 | |
26 | SHA1 (patch-az) = 56a3adedfc87cbbb0307ccb4b452665f79bde582 | 26 | SHA1 (patch-az) = 56a3adedfc87cbbb0307ccb4b452665f79bde582 | |
27 | SHA1 (patch-pyconfig.h.in) = c4544178ecceffb6ed911df39d3a64bff665cb34 | 27 | SHA1 (patch-pyconfig.h.in) = c4544178ecceffb6ed911df39d3a64bff665cb34 | |
28 | SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0 | 28 | SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0 |
@@ -1,32 +1,34 @@ | @@ -1,32 +1,34 @@ | |||
1 | $NetBSD: patch-am,v 1.14 2014/03/27 05:36:37 obache Exp $ | 1 | $NetBSD: patch-am,v 1.14.2.1 2014/04/14 11:38:45 tron 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 | |
15 | Those have separate packages where needed. | 15 | Those have separate packages where needed. | |
16 | 16 | |||
17 | Only check the BUILDLINK_DIR for libraries etc, do not pick up random | 17 | Only check the BUILDLINK_DIR for libraries etc, do not pick up random | |
18 | headers and libraries from the system. | 18 | headers and libraries from the system. | |
19 | 19 | |||
20 | Build the _ssl module with pkgsrc choiced OpenSSL. | |||
21 | ||||
20 | Build the 1.85 compat module all the time against the BDB version of choice. | 22 | Build the 1.85 compat module all the time against the BDB version of choice. | |
21 | 23 | |||
22 | cygwin 2.7.3-no-libm.patch | 24 | cygwin 2.7.3-no-libm.patch | |
23 | 25 | |||
24 | --- setup.py.orig 2013-11-10 07:36:41.000000000 +0000 | 26 | --- setup.py.orig 2013-11-10 07:36:41.000000000 +0000 | |
25 | +++ setup.py | 27 | +++ setup.py | |
26 | @@ -33,7 +33,7 @@ host_platform = get_platform() | 28 | @@ -33,7 +33,7 @@ host_platform = get_platform() | |
27 | COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) | 29 | COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) | |
28 | 30 | |||
29 | # This global variable is used to hold the list of modules to be disabled. | 31 | # This global variable is used to hold the list of modules to be disabled. | |
30 | -disabled_module_list = [] | 32 | -disabled_module_list = [] | |
31 | +disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline", "linuxaudiodev", "ossaudiodev", "spwd", "sunaudiodev"] | 33 | +disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline", "linuxaudiodev", "ossaudiodev", "spwd", "sunaudiodev"] | |
32 | 34 | |||
@@ -51,38 +53,60 @@ cygwin 2.7.3-no-libm.patch | @@ -51,38 +53,60 @@ cygwin 2.7.3-no-libm.patch | |||
51 | + self.compiler.include_dirs.insert(0, incdir) | 53 | + self.compiler.include_dirs.insert(0, incdir) | |
52 | if cross_compiling: | 54 | if cross_compiling: | |
53 | self.add_gcc_paths() | 55 | self.add_gcc_paths() | |
54 | self.add_multiarch_paths() | 56 | self.add_multiarch_paths() | |
55 | @@ -551,7 +556,7 @@ class PyBuildExt(build_ext): | 57 | @@ -551,7 +556,7 @@ class PyBuildExt(build_ext): | |
56 | 58 | |||
57 | # 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 | |
58 | math_libs = ['m'] | 60 | math_libs = ['m'] | |
59 | - if host_platform in ['darwin', 'beos']: | 61 | - if host_platform in ['darwin', 'beos']: | |
60 | + if host_platform in ['darwin', 'beos', 'cygwin']: | 62 | + if host_platform in ['darwin', 'beos', 'cygwin']: | |
61 | math_libs = [] | 63 | math_libs = [] | |
62 | 64 | |||
63 | # XXX Omitted modules: gl, pure, dl, SGI-specific modules | 65 | # XXX Omitted modules: gl, pure, dl, SGI-specific modules | |
64 | @@ -797,9 +802,7 @@ class PyBuildExt(build_ext): | 66 | @@ -785,10 +790,9 @@ class PyBuildExt(build_ext): | |
67 | libraries=math_libs) ) | |||
68 | # Detect SSL support for the socket module (via _ssl) | |||
69 | search_for_ssl_incs_in = [ | |||
70 | - '/usr/local/ssl/include', | |||
71 | - '/usr/contrib/ssl/include/' | |||
72 | + '@SSLBASE@/include' | |||
73 | ] | |||
74 | - ssl_incs = find_file('openssl/ssl.h', inc_dirs, | |||
75 | + ssl_incs = find_file('openssl/ssl.h', [], | |||
76 | search_for_ssl_incs_in | |||
77 | ) | |||
78 | if ssl_incs is not None: | |||
79 | @@ -797,9 +801,7 @@ class PyBuildExt(build_ext): | |||
65 | if krb5_h: | 80 | if krb5_h: | |
66 | ssl_incs += krb5_h | 81 | ssl_incs += krb5_h | |
67 | ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, | 82 | ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, | |
68 | - ['/usr/local/ssl/lib', | 83 | - ['/usr/local/ssl/lib', | |
69 | - '/usr/contrib/ssl/lib/' | 84 | - '/usr/contrib/ssl/lib/' | |
70 | - ] ) | 85 | - ] ) | |
71 | + [] ) | 86 | + [] ) | |
72 | 87 | |||
73 | if (ssl_incs is not None and | 88 | if (ssl_incs is not None and | |
74 | ssl_libs is not None): | 89 | ssl_libs is not None): | |
75 | @@ -918,175 +921,6 @@ class PyBuildExt(build_ext): | 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): | |||
76 | else: | 100 | else: | |
77 | raise ValueError("unknown major BerkeleyDB version", major) | 101 | raise ValueError("unknown major BerkeleyDB version", major) | |
78 | 102 | |||
79 | - # construct a list of paths to look for the header file in on | 103 | - # construct a list of paths to look for the header file in on | |
80 | - # top of the normal inc_dirs. | 104 | - # top of the normal inc_dirs. | |
81 | - db_inc_paths = [ | 105 | - db_inc_paths = [ | |
82 | - '/usr/include/db4', | 106 | - '/usr/include/db4', | |
83 | - '/usr/local/include/db4', | 107 | - '/usr/local/include/db4', | |
84 | - '/opt/sfw/include/db4', | 108 | - '/opt/sfw/include/db4', | |
85 | - '/usr/include/db3', | 109 | - '/usr/include/db3', | |
86 | - '/usr/local/include/db3', | 110 | - '/usr/local/include/db3', | |
87 | - '/opt/sfw/include/db3', | 111 | - '/opt/sfw/include/db3', | |
88 | - # Fink defaults (http://fink.sourceforge.net/) | 112 | - # Fink defaults (http://fink.sourceforge.net/) | |
@@ -238,27 +262,27 @@ cygwin 2.7.3-no-libm.patch | @@ -238,27 +262,27 @@ cygwin 2.7.3-no-libm.patch | |||
238 | - runtime_library_dirs=dblib_dir, | 262 | - runtime_library_dirs=dblib_dir, | |
239 | - include_dirs=db_incs, | 263 | - include_dirs=db_incs, | |
240 | - libraries=dblibs)) | 264 | - libraries=dblibs)) | |
241 | - else: | 265 | - else: | |
242 | - if db_setup_debug: print "db: no appropriate library found" | 266 | - if db_setup_debug: print "db: no appropriate library found" | |
243 | - db_incs = None | 267 | - db_incs = None | |
244 | - dblibs = [] | 268 | - dblibs = [] | |
245 | - dblib_dir = None | 269 | - dblib_dir = None | |
246 | - missing.append('_bsddb') | 270 | - missing.append('_bsddb') | |
247 | - | 271 | - | |
248 | # The sqlite interface | 272 | # The sqlite interface | |
249 | sqlite_setup_debug = False # verbose debug prints from this script? | 273 | sqlite_setup_debug = False # verbose debug prints from this script? | |
250 | 274 | |||
251 | @@ -1204,35 +1038,39 @@ class PyBuildExt(build_ext): | 275 | @@ -1204,35 +1037,39 @@ class PyBuildExt(build_ext): | |
252 | # we do not build this one. Otherwise this build will pick up | 276 | # we do not build this one. Otherwise this build will pick up | |
253 | # the more recent berkeleydb's db.h file first in the include path | 277 | # the more recent berkeleydb's db.h file first in the include path | |
254 | # when attempting to compile and it will fail. | 278 | # when attempting to compile and it will fail. | |
255 | - f = "/usr/include/db.h" | 279 | - f = "/usr/include/db.h" | |
256 | - | 280 | - | |
257 | - if host_platform == 'darwin': | 281 | - if host_platform == 'darwin': | |
258 | - if is_macosx_sdk_path(f): | 282 | - if is_macosx_sdk_path(f): | |
259 | - sysroot = macosx_sdk_root() | 283 | - sysroot = macosx_sdk_root() | |
260 | - f = os.path.join(sysroot, f[1:]) | 284 | - f = os.path.join(sysroot, f[1:]) | |
261 | - | 285 | - | |
262 | - if os.path.exists(f) and not db_incs: | 286 | - if os.path.exists(f) and not db_incs: | |
263 | - data = open(f).read() | 287 | - data = open(f).read() | |
264 | - m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) | 288 | - m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) | |
@@ -302,62 +326,62 @@ cygwin 2.7.3-no-libm.patch | @@ -302,62 +326,62 @@ cygwin 2.7.3-no-libm.patch | |||
302 | + while 1: | 326 | + while 1: | |
303 | + line = input.readline() | 327 | + line = input.readline() | |
304 | + if not line: break | 328 | + if not line: break | |
305 | + if re.search('This file is part of GDBM', line): | 329 | + if re.search('This file is part of GDBM', line): | |
306 | + ret = None | 330 | + ret = None | |
307 | + break | 331 | + break | |
308 | + input.close() | 332 | + input.close() | |
309 | + break | 333 | + break | |
310 | + return ret | 334 | + return ret | |
311 | + | 335 | + | |
312 | config_args = [arg.strip("'") | 336 | config_args = [arg.strip("'") | |
313 | for arg in sysconfig.get_config_var("CONFIG_ARGS").split()] | 337 | for arg in sysconfig.get_config_var("CONFIG_ARGS").split()] | |
314 | dbm_args = [arg for arg in config_args | 338 | dbm_args = [arg for arg in config_args | |
315 | @@ -1244,7 +1082,7 @@ class PyBuildExt(build_ext): | 339 | @@ -1244,7 +1081,7 @@ class PyBuildExt(build_ext): | |
316 | dbmext = None | 340 | dbmext = None | |
317 | for cand in dbm_order: | 341 | for cand in dbm_order: | |
318 | if cand == "ndbm": | 342 | if cand == "ndbm": | |
319 | - if find_file("ndbm.h", inc_dirs, []) is not None: | 343 | - if find_file("ndbm.h", inc_dirs, []) is not None: | |
320 | + if find_ndbm_h(inc_dirs) is not None: | 344 | + if find_ndbm_h(inc_dirs) is not None: | |
321 | # Some systems have -lndbm, others have -lgdbm_compat, | 345 | # Some systems have -lndbm, others have -lgdbm_compat, | |
322 | # others don't have either | 346 | # others don't have either | |
323 | if self.compiler.find_library_file(lib_dirs, | 347 | if self.compiler.find_library_file(lib_dirs, | |
324 | @@ -1288,18 +1126,14 @@ class PyBuildExt(build_ext): | 348 | @@ -1288,18 +1125,14 @@ class PyBuildExt(build_ext): | |
325 | libraries = gdbm_libs) | 349 | libraries = gdbm_libs) | |
326 | break | 350 | break | |
327 | elif cand == "bdb": | 351 | elif cand == "bdb": | |
328 | - if db_incs is not None: | 352 | - if db_incs is not None: | |
329 | - print "building dbm using bdb" | 353 | - print "building dbm using bdb" | |
330 | - dbmext = Extension('dbm', ['dbmmodule.c'], | 354 | - dbmext = Extension('dbm', ['dbmmodule.c'], | |
331 | - library_dirs=dblib_dir, | 355 | - library_dirs=dblib_dir, | |
332 | - runtime_library_dirs=dblib_dir, | 356 | - runtime_library_dirs=dblib_dir, | |
333 | - include_dirs=db_incs, | 357 | - include_dirs=db_incs, | |
334 | - define_macros=[ | 358 | - define_macros=[ | |
335 | - ('HAVE_BERKDB_H', None), | 359 | - ('HAVE_BERKDB_H', None), | |
336 | - ('DB_DBM_HSEARCH', None), | 360 | - ('DB_DBM_HSEARCH', None), | |
337 | - ], | 361 | - ], | |
338 | - libraries=dblibs) | 362 | - libraries=dblibs) | |
339 | - break | 363 | - break | |
340 | + print "building dbm using bdb" | 364 | + print "building dbm using bdb" | |
341 | + dbmext = Extension('dbm', ['dbmmodule.c'], | 365 | + dbmext = Extension('dbm', ['dbmmodule.c'], | |
342 | + define_macros=[ | 366 | + define_macros=[ | |
343 | + ('HAVE_BERKDB_H', None), | 367 | + ('HAVE_BERKDB_H', None), | |
344 | + ('DB_DBM_HSEARCH', None), | 368 | + ('DB_DBM_HSEARCH', None), | |
345 | + ], | 369 | + ], | |
346 | + libraries=["db"]) | 370 | + libraries=["db"]) | |
347 | + break | 371 | + break | |
348 | if dbmext is not None: | 372 | if dbmext is not None: | |
349 | exts.append(dbmext) | 373 | exts.append(dbmext) | |
350 | else: | 374 | else: | |
351 | @@ -2222,9 +2056,9 @@ def main(): | 375 | @@ -2222,9 +2055,9 @@ def main(): | |
352 | ext_modules=[Extension('_struct', ['_struct.c'])], | 376 | ext_modules=[Extension('_struct', ['_struct.c'])], | |
353 | 377 | |||
354 | # Scripts to install | 378 | # Scripts to install | |
355 | - scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', | 379 | - scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', | |
356 | - 'Tools/scripts/2to3', | 380 | - 'Tools/scripts/2to3', | |
357 | - 'Lib/smtpd.py'] | 381 | - 'Lib/smtpd.py'] | |
358 | + scripts = ['Tools/scripts/pydoc2.7', | 382 | + scripts = ['Tools/scripts/pydoc2.7', | |
359 | + 'Tools/scripts/2to3-2.7', | 383 | + 'Tools/scripts/2to3-2.7', | |
360 | + 'Tools/scripts/smtpd2.7.py'] | 384 | + 'Tools/scripts/smtpd2.7.py'] | |
361 | ) | 385 | ) | |
362 | 386 | |||
363 | # --install-platlib | 387 | # --install-platlib |