summaryrefslogtreecommitdiff
path: root/lang/python33/patches/patch-am
diff options
context:
space:
mode:
Diffstat (limited to 'lang/python33/patches/patch-am')
-rw-r--r--lang/python33/patches/patch-am24
1 files changed, 12 insertions, 12 deletions
diff --git a/lang/python33/patches/patch-am b/lang/python33/patches/patch-am
index 50ccb355b97..512fa8de92a 100644
--- a/lang/python33/patches/patch-am
+++ b/lang/python33/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
+$NetBSD: patch-am,v 1.3 2013/05/26 17:56:09 wiz Exp $
---- setup.py.orig 2012-09-29 04:00:50.000000000 -0400
-+++ setup.py 2012-12-09 19:06:51.000000000 -0500
-@@ -31,7 +31,8 @@
+--- setup.py.orig 2013-05-15 16:33:00.000000000 +0000
++++ setup.py
+@@ -31,7 +31,8 @@ host_platform = get_platform()
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
# This global variable is used to hold the list of modules to be disabled.
@@ -10,9 +10,9 @@ $NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree",
+"_sqlite3", "_tkinter", "_gdbm", "pyexpat", "readline", "xxlimited"]
- # File which contains the directory for shared mods (for sys.path fixup
- # when running from the build dir, see Modules/getpath.c)
-@@ -455,15 +456,15 @@
+ def add_dir_to_list(dirlist, dir):
+ """Add the directory 'dir' to the list 'dirlist' (after any relative
+@@ -435,15 +436,15 @@ class PyBuildExt(build_ext):
os.unlink(tmpfile)
def detect_modules(self):
@@ -37,7 +37,7 @@ $NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
self.add_multiarch_paths()
# Add paths specified in the environment variables LDFLAGS and
-@@ -770,9 +771,7 @@
+@@ -753,9 +754,7 @@ class PyBuildExt(build_ext):
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -48,7 +48,7 @@ $NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
if (ssl_incs is not None and
ssl_libs is not None):
-@@ -1155,6 +1154,30 @@
+@@ -1138,6 +1137,30 @@ class PyBuildExt(build_ext):
dbm_order = ['gdbm']
# The standard Unix dbm module:
if host_platform not in ['cygwin']:
@@ -79,7 +79,7 @@ $NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
config_args = [arg.strip("'")
for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
dbm_args = [arg for arg in config_args
-@@ -1166,7 +1189,7 @@
+@@ -1149,7 +1172,7 @@ class PyBuildExt(build_ext):
dbmext = None
for cand in dbm_order:
if cand == "ndbm":
@@ -88,7 +88,7 @@ $NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
# Some systems have -lndbm, others have -lgdbm_compat,
# others don't have either
if self.compiler.find_library_file(lib_dirs,
-@@ -1476,6 +1499,14 @@
+@@ -1475,6 +1498,14 @@ class PyBuildExt(build_ext):
macros = dict()
libraries = []
@@ -103,7 +103,7 @@ $NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
else: # Linux and other unices
macros = dict()
libraries = ['rt']
-@@ -2143,7 +2174,7 @@
+@@ -2155,7 +2186,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