diff options
Diffstat (limited to 'lang/python27/files/patch-setup.py')
| -rw-r--r-- | lang/python27/files/patch-setup.py | 77 |
1 files changed, 58 insertions, 19 deletions
diff --git a/lang/python27/files/patch-setup.py b/lang/python27/files/patch-setup.py index 13fdd368cdda..f6fae7871aeb 100644 --- a/lang/python27/files/patch-setup.py +++ b/lang/python27/files/patch-setup.py @@ -1,6 +1,21 @@ ---- ./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 @@ +# Description: Partial script installation backport from Python3 +# Submitted by: mva + +# Description: Some modules are installed via other ports + +# Description: ossaudiodev detection fix backport + +--- setup.py.orig 2014-06-30 04:05:48.000000000 +0200 ++++ setup.py 2014-07-26 14:51:29.000000000 +0200 +@@ -15,6 +15,7 @@ + from distutils.command.build_ext import build_ext + from distutils.command.install import install + from distutils.command.install_lib import install_lib ++from distutils.command.build_scripts import build_scripts + from distutils.spawn import find_executable + + cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ +@@ -33,7 +34,7 @@ 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. @@ -9,16 +24,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -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']) ) -+ else: -+ open('.without_own_sha', 'w') - - # Modules that provide persistent dictionary-like semantics. You will - # probably want to arrange for at least one of them to be available on -@@ -1212,7 +1214,7 @@ +@@ -1212,7 +1213,7 @@ sysroot = macosx_sdk_root() f = os.path.join(sysroot, f[1:]) @@ -27,7 +33,7 @@ data = open(f).read() m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) if m is not None: -@@ -1551,7 +1553,7 @@ +@@ -1551,7 +1552,7 @@ macros = dict() libraries = [] @@ -36,7 +42,7 @@ # FreeBSD's P1003.1b semaphore support is very experimental # and has many known problems. (as of June 2008) macros = dict() -@@ -1602,9 +1604,10 @@ +@@ -1602,9 +1603,10 @@ else: missing.append('linuxaudiodev') @@ -50,14 +56,47 @@ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) else: missing.append('ossaudiodev') -@@ -2228,9 +2231,7 @@ - ext_modules=[Extension('_struct', ['_struct.c'])], +@@ -2176,6 +2178,22 @@ + def is_chmod_supported(self): + return hasattr(os, 'chmod') + ++class PyBuildScripts(build_scripts): ++ def copy_scripts(self): ++ outfiles = build_scripts.copy_scripts(self) ++ fullversion = '{0[0]}.{0[1]}'.format(sys.version_info) ++ newoutfiles = [] ++ for filename in outfiles: ++ if filename.endswith('2to3'): ++ newfilename = filename + '-' + fullversion ++ else: ++ newfilename = filename + fullversion ++ log.info('renaming {} to {}'.format(filename, newfilename)) ++ os.rename(filename, newfilename) ++ newoutfiles.append(newfilename) ++ return newoutfiles ++ ++ + SUMMARY = """ + Python is an interpreted, interactive, object-oriented programming + language. It is often compared to Tcl, Perl, Scheme or Java. +@@ -2221,7 +2239,9 @@ + platforms = ["Many"], + + # Build info +- cmdclass = {'build_ext':PyBuildExt, 'install':PyBuildInstall, ++ cmdclass = {'build_ext':PyBuildExt, ++ 'build_scripts':PyBuildScripts, ++ 'install':PyBuildInstall, + 'install_lib':PyBuildInstallLib}, + # The struct module is defined here, because build_ext won't be + # called unless there's at least one extension module defined. +@@ -2229,8 +2249,7 @@ # Scripts to install -- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', + scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', - 'Tools/scripts/2to3', - 'Lib/smtpd.py'] -+ scripts = [] ++ 'Tools/scripts/2to3'] ) # --install-platlib |