diff options
Diffstat (limited to 'lang/python33/patches/patch-am')
| -rw-r--r-- | lang/python33/patches/patch-am | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/lang/python33/patches/patch-am b/lang/python33/patches/patch-am index 70f33141d7f..25264ca648e 100644 --- a/lang/python33/patches/patch-am +++ b/lang/python33/patches/patch-am @@ -1,6 +1,6 @@ -$NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $ +$NetBSD: patch-am,v 1.6 2014/05/09 02:29:10 obache Exp $ ---- setup.py.orig 2013-05-15 16:33:00.000000000 +0000 +--- setup.py.orig 2014-03-09 08:40:35.000000000 +0000 +++ setup.py @@ -31,7 +31,8 @@ host_platform = get_platform() COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) @@ -37,7 +37,17 @@ $NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $ self.add_multiarch_paths() # Add paths specified in the environment variables LDFLAGS and -@@ -753,9 +754,7 @@ class PyBuildExt(build_ext): +@@ -741,8 +742,7 @@ class PyBuildExt(build_ext): + depends = ['socketmodule.h']) ) + # Detect SSL support for the socket module (via _ssl) + search_for_ssl_incs_in = [ +- '/usr/local/ssl/include', +- '/usr/contrib/ssl/include/' ++ '@SSLBASE@/include' + ] + ssl_incs = find_file('openssl/ssl.h', inc_dirs, + search_for_ssl_incs_in +@@ -753,9 +753,7 @@ class PyBuildExt(build_ext): if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, @@ -48,7 +58,16 @@ $NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $ if (ssl_incs is not None and ssl_libs is not None): -@@ -1138,6 +1137,30 @@ class PyBuildExt(build_ext): +@@ -774,7 +772,7 @@ class PyBuildExt(build_ext): + + # look for the openssl version header on the compiler search path. + opensslv_h = find_file('openssl/opensslv.h', [], +- inc_dirs + search_for_ssl_incs_in) ++ search_for_ssl_incs_in) + if opensslv_h: + name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') + if host_platform == 'darwin' and is_macosx_sdk_path(name): +@@ -1138,6 +1136,30 @@ class PyBuildExt(build_ext): dbm_order = ['gdbm'] # The standard Unix dbm module: if host_platform not in ['cygwin']: @@ -79,7 +98,7 @@ $NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $ config_args = [arg.strip("'") for arg in sysconfig.get_config_var("CONFIG_ARGS").split()] dbm_args = [arg for arg in config_args -@@ -1149,7 +1172,7 @@ class PyBuildExt(build_ext): +@@ -1149,7 +1171,7 @@ class PyBuildExt(build_ext): dbmext = None for cand in dbm_order: if cand == "ndbm": @@ -88,7 +107,7 @@ $NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $ # Some systems have -lndbm, others have -lgdbm_compat, # others don't have either if self.compiler.find_library_file(lib_dirs, -@@ -1475,6 +1498,14 @@ class PyBuildExt(build_ext): +@@ -1477,6 +1499,14 @@ class PyBuildExt(build_ext): macros = dict() libraries = [] @@ -103,7 +122,7 @@ $NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $ else: # Linux and other unices macros = dict() libraries = ['rt'] -@@ -1906,10 +1937,7 @@ class PyBuildExt(build_ext): +@@ -1950,10 +1980,7 @@ class PyBuildExt(build_ext): depends = ['_decimal/docstrings.h'] else: srcdir = sysconfig.get_config_var('srcdir') @@ -115,7 +134,7 @@ $NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $ libraries = [] sources = [ '_decimal/_decimal.c', -@@ -2155,7 +2183,7 @@ def main(): +@@ -2199,7 +2226,7 @@ def main(): # If you change the scripts installed here, you also need to # check the PyBuildScripts command above, and change the links # created by the bininstall target in Makefile.pre.in |