diff options
Diffstat (limited to 'lang/python27/files/patch-setup.py')
| -rw-r--r-- | lang/python27/files/patch-setup.py | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/lang/python27/files/patch-setup.py b/lang/python27/files/patch-setup.py index c7825e0f1872..efc930c596a5 100644 --- a/lang/python27/files/patch-setup.py +++ b/lang/python27/files/patch-setup.py @@ -1,7 +1,7 @@ ---- setup.py.orig 2009-03-31 18:20:48.000000000 +0000 -+++ setup.py 2009-09-10 05:27:01.000000000 +0000 -@@ -17,7 +17,7 @@ from distutils.command.install import in - from distutils.command.install_lib import install_lib +--- setup.py.orig 2010-06-07 09:55:38.000000000 +0800 ++++ setup.py 2010-06-07 10:03:30.000000000 +0800 +@@ -21,7 +21,7 @@ + COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount') # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] @@ -9,17 +9,17 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -577,7 +577,7 @@ class PyBuildExt(build_ext): - - readline_libs = ['readline'] - if self.compiler.find_library_file(lib_dirs, -- 'ncursesw'): -+ 'xxxncursesw'): - readline_libs.append('ncursesw') - elif self.compiler.find_library_file(lib_dirs, - 'ncurses'): -@@ -589,7 +589,7 @@ class PyBuildExt(build_ext): - 'termcap'): +@@ -608,7 +608,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, 'xxxncursesw'): + curses_library = 'ncursesw' + elif self.compiler.find_library_file(lib_dirs, 'ncurses'): + curses_library = 'ncurses' +@@ -647,7 +647,7 @@ + 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], @@ -27,7 +27,7 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -689,6 +689,8 @@ class PyBuildExt(build_ext): +@@ -749,6 +749,8 @@ # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash exts.append( Extension('_sha256', ['sha256module.c']) ) exts.append( Extension('_sha512', ['sha512module.c']) ) @@ -36,59 +36,59 @@ # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on -@@ -990,7 +992,7 @@ class PyBuildExt(build_ext): - # the more recent berkeleydb's db.h file first in the include path - # when attempting to compile and it will fail. - f = "/usr/include/db.h" +@@ -1085,7 +1087,7 @@ + sysroot = macosx_sdk_root() + f = os.path.join(sysroot, f[1:]) + - if os.path.exists(f) and not db_incs: + if os.path.exists(f): data = open(f).read() m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) if m is not None: -@@ -1080,7 +1082,7 @@ class PyBuildExt(build_ext): +@@ -1210,13 +1212,14 @@ # Curses support, requiring the System V version of curses, often # provided by the ncurses library. panel_library = 'panel' -- if (self.compiler.find_library_file(lib_dirs, 'ncursesw')): -+ if (self.compiler.find_library_file(lib_dirs, 'xxxncursesw')): - curses_libs = ['ncursesw'] - # Bug 1464056: If _curses.so links with ncursesw, - # _curses_panel.so must link with panelw. -@@ -1090,6 +1092,7 @@ class PyBuildExt(build_ext): - elif (self.compiler.find_library_file(lib_dirs, 'ncurses')): - curses_libs = ['ncurses'] +- if curses_library.startswith('ncurses'): +- if curses_library == 'ncursesw': ++ if curses_library.startswith('xxxncurses'): ++ if curses_library == 'xxxncursesw': + # Bug 1464056: If _curses.so links with ncursesw, + # _curses_panel.so must link with panelw. + panel_library = 'panelw' + curses_libs = [curses_library] exts.append( Extension('_curses', ['_cursesmodule.c'], + library_dirs = ['/usr/lib'], libraries = curses_libs) ) - elif (self.compiler.find_library_file(lib_dirs, 'curses') - and platform != 'darwin'): -@@ -1111,6 +1114,7 @@ class PyBuildExt(build_ext): - if (module_enabled(exts, '_curses') and - self.compiler.find_library_file(lib_dirs, panel_library)): - exts.append( Extension('_curses_panel', ['_curses_panel.c'], + elif curses_library == 'curses' and platform != 'darwin': + # OSX has an old Berkeley curses, not good enough for +@@ -1229,6 +1232,7 @@ + curses_libs = ['curses'] + + exts.append( Extension('_curses', ['_cursesmodule.c'], + library_dirs = ['/usr/lib'], - libraries = [panel_library] + curses_libs) ) + libraries = curses_libs) ) else: - missing.append('_curses_panel') -@@ -1273,7 +1277,7 @@ class PyBuildExt(build_ext): - ) + missing.append('_curses') +@@ -1397,7 +1401,7 @@ + macros = dict() libraries = [] - elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'): + elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'): # FreeBSD's P1003.1b semaphore support is very experimental # and has many known problems. (as of June 2008) - macros = dict( # FreeBSD -@@ -1338,7 +1342,7 @@ class PyBuildExt(build_ext): + macros = dict() +@@ -1449,7 +1453,7 @@ missing.append('linuxaudiodev') - if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', -- 'freebsd7', 'freebsd8'): -+ 'freebsd7', 'freebsd8', 'freebsd9'): + if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', +- 'freebsd7', 'freebsd8') ++ 'freebsd7', 'freebsd8', 'freebsd9') + or platform.startswith("gnukfreebsd")): exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) else: - missing.append('ossaudiodev') -@@ -1891,9 +1895,7 @@ def main(): +@@ -2031,9 +2035,7 @@ ext_modules=[Extension('_struct', ['_struct.c'])], # Scripts to install |