diff options
Diffstat (limited to 'lang/python27/files/patch-setup.py')
| -rw-r--r-- | lang/python27/files/patch-setup.py | 66 |
1 files changed, 15 insertions, 51 deletions
diff --git a/lang/python27/files/patch-setup.py b/lang/python27/files/patch-setup.py index 3612bd9d5d43..13fdd368cdda 100644 --- a/lang/python27/files/patch-setup.py +++ b/lang/python27/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig 2013-04-06 18:02:41.000000000 +0400 -+++ setup.py 2013-04-07 10:52:47.000000000 +0400 +--- ./setup.py.orig 2014-07-04 18:02:21.711919294 +1000 ++++ ./setup.py 2014-07-04 18:11:14.642091269 +1000 @@ -33,7 +33,7 @@ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) @@ -9,25 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -720,7 +720,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' -@@ -755,7 +755,7 @@ - elif curses_library: - readline_libs.append(curses_library) - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/lib', '/usr/lib/termcap'], - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -@@ -862,6 +862,8 @@ +@@ -867,6 +867,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,7 +18,7 @@ # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on -@@ -1208,7 +1210,7 @@ +@@ -1212,7 +1214,7 @@ sysroot = macosx_sdk_root() f = os.path.join(sysroot, f[1:]) @@ -45,30 +27,7 @@ data = open(f).read() m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) if m is not None: -@@ -1338,12 +1340,13 @@ - # provided by the ncurses library. - panel_library = 'panel' - if curses_library.startswith('ncurses'): -- if curses_library == 'ncursesw': -+ 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 curses_library == 'curses' and host_platform != 'darwin': - # OSX has an old Berkeley curses, not good enough for -@@ -1356,6 +1359,7 @@ - curses_libs = ['curses'] - - exts.append( Extension('_curses', ['_cursesmodule.c'], -+ library_dirs = ['/usr/lib'], - libraries = curses_libs) ) - else: - missing.append('_curses') -@@ -1540,7 +1544,7 @@ +@@ -1551,7 +1553,7 @@ macros = dict() libraries = [] @@ -77,16 +36,21 @@ # FreeBSD's P1003.1b semaphore support is very experimental # and has many known problems. (as of June 2008) macros = dict() -@@ -1592,7 +1596,7 @@ +@@ -1602,9 +1604,10 @@ + else: missing.append('linuxaudiodev') - if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', +- if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', - 'freebsd7', 'freebsd8') -+ 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11') - or host_platform.startswith("gnukfreebsd")): +- or host_platform.startswith("gnukfreebsd")): ++# Initial backport of http://hg.python.org/cpython/rev/50f1922bc1d5 ++ ++ if any(sys.platform.startswith(prefix) ++ for prefix in ("linux", "freebsd", "gnukfreebsd")): exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) else: -@@ -2176,9 +2180,7 @@ + missing.append('ossaudiodev') +@@ -2228,9 +2231,7 @@ ext_modules=[Extension('_struct', ['_struct.c'])], # Scripts to install |