diff options
Diffstat (limited to 'lang/python33/files/patch-setup.py')
| -rw-r--r-- | lang/python33/files/patch-setup.py | 63 |
1 files changed, 5 insertions, 58 deletions
diff --git a/lang/python33/files/patch-setup.py b/lang/python33/files/patch-setup.py index 55d6d3fd1fa3..ff985a2efd08 100644 --- a/lang/python33/files/patch-setup.py +++ b/lang/python33/files/patch-setup.py @@ -1,5 +1,5 @@ ---- ./setup.py.orig 2012-09-29 18:00:50.000000000 +1000 -+++ ./setup.py 2012-10-04 20:21:15.000000000 +1000 +--- setup.py.orig 2014-03-09 09:40:35.000000000 +0100 ++++ setup.py 2014-07-15 08:17:17.000000000 +0200 @@ -31,7 +31,7 @@ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) @@ -7,52 +7,9 @@ -disabled_module_list = [] +disabled_module_list = ["_sqlite3", "_tkinter", "_gdbm"] - # File which contains the directory for shared mods (for sys.path fixup - # when running from the build dir, see Modules/getpath.c) -@@ -694,7 +694,7 @@ - # use the same library for the readline and curses modules. - if 'curses' in readline_termcap_library: - curses_library = readline_termcap_library -- elif self.compiler.find_library_file(lib_dirs, 'ncursesw'): -+ elif self.compiler.find_library_file(lib_dirs, 'XXXXncursesw'): - curses_library = 'ncursesw' - elif self.compiler.find_library_file(lib_dirs, 'ncurses'): - curses_library = 'ncurses' -@@ -733,7 +733,7 @@ - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], -+ library_dirs=['/usr/lib','/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: -@@ -1261,7 +1261,7 @@ - curses_defines = [] - curses_includes = [] - panel_library = 'panel' -- if curses_library == 'ncursesw': -+ if curses_library == 'XXXXncursesw': - curses_defines.append(('HAVE_NCURSESW', '1')) - curses_includes.append('/usr/include/ncursesw') - # Bug 1464056: If _curses.so links with ncursesw, -@@ -1285,6 +1285,7 @@ - exts.append( Extension('_curses', ['_cursesmodule.c'], - include_dirs=curses_includes, - define_macros=curses_defines, -+ library_dirs = ['/usr/lib'], - libraries = curses_libs) ) - elif curses_library == 'curses' and host_platform != 'darwin': - # OSX has an old Berkeley curses, not good enough for -@@ -1298,6 +1299,7 @@ - - exts.append( Extension('_curses', ['_cursesmodule.c'], - define_macros=curses_defines, -+ library_dirs = ['/usr/lib'], - libraries = curses_libs) ) - else: - missing.append('_curses') -@@ -1462,7 +1464,7 @@ + def add_dir_to_list(dirlist, dir): + """Add the directory 'dir' to the list 'dirlist' (after any relative +@@ -1463,7 +1463,7 @@ macros = dict() libraries = [] @@ -61,13 +18,3 @@ # FreeBSD's P1003.1b semaphore support is very experimental # and has many known problems. (as of June 2008) macros = dict() -@@ -2143,8 +2145,7 @@ - # 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 -- scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3", -- "Tools/scripts/2to3", "Tools/scripts/pyvenv"] -+ scripts = [] - ) - - # --install-platlib |