|
Lines 5-13
Link Here
|
| 5 |
|
5 |
|
| 6 |
# Description: ossaudiodev detection fix backport |
6 |
# Description: ossaudiodev detection fix backport |
| 7 |
|
7 |
|
| 8 |
--- setup.py.orig 2014-06-30 04:05:48.000000000 +0200 |
8 |
--- setup.py.orig 2014-12-10 16:00:01 UTC |
| 9 |
+++ setup.py 2014-07-26 14:51:29.000000000 +0200 |
9 |
+++ setup.py |
| 10 |
@@ -15,6 +15,7 @@ |
10 |
@@ -15,6 +15,7 @@ from distutils.core import Extension, se |
| 11 |
from distutils.command.build_ext import build_ext |
11 |
from distutils.command.build_ext import build_ext |
| 12 |
from distutils.command.install import install |
12 |
from distutils.command.install import install |
| 13 |
from distutils.command.install_lib import install_lib |
13 |
from distutils.command.install_lib import install_lib |
|
Lines 15-21
Link Here
|
| 15 |
from distutils.spawn import find_executable |
15 |
from distutils.spawn import find_executable |
| 16 |
|
16 |
|
| 17 |
cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ |
17 |
cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ |
| 18 |
@@ -33,7 +34,7 @@ |
18 |
@@ -33,7 +34,7 @@ host_platform = get_platform() |
| 19 |
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) |
19 |
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) |
| 20 |
|
20 |
|
| 21 |
# This global variable is used to hold the list of modules to be disabled. |
21 |
# This global variable is used to hold the list of modules to be disabled. |
|
Lines 24-30
Link Here
|
| 24 |
|
24 |
|
| 25 |
def add_dir_to_list(dirlist, dir): |
25 |
def add_dir_to_list(dirlist, dir): |
| 26 |
"""Add the directory 'dir' to the list 'dirlist' (at the front) if |
26 |
"""Add the directory 'dir' to the list 'dirlist' (at the front) if |
| 27 |
@@ -1212,7 +1213,7 @@ |
27 |
@@ -1214,7 +1215,7 @@ class PyBuildExt(build_ext): |
| 28 |
sysroot = macosx_sdk_root() |
28 |
sysroot = macosx_sdk_root() |
| 29 |
f = os.path.join(sysroot, f[1:]) |
29 |
f = os.path.join(sysroot, f[1:]) |
| 30 |
|
30 |
|
|
Lines 33-39
Link Here
|
| 33 |
data = open(f).read() |
33 |
data = open(f).read() |
| 34 |
m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) |
34 |
m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) |
| 35 |
if m is not None: |
35 |
if m is not None: |
| 36 |
@@ -1551,7 +1552,7 @@ |
36 |
@@ -1553,7 +1554,7 @@ class PyBuildExt(build_ext): |
| 37 |
macros = dict() |
37 |
macros = dict() |
| 38 |
libraries = [] |
38 |
libraries = [] |
| 39 |
|
39 |
|
|
Lines 42-48
Link Here
|
| 42 |
# FreeBSD's P1003.1b semaphore support is very experimental |
42 |
# FreeBSD's P1003.1b semaphore support is very experimental |
| 43 |
# and has many known problems. (as of June 2008) |
43 |
# and has many known problems. (as of June 2008) |
| 44 |
macros = dict() |
44 |
macros = dict() |
| 45 |
@@ -1602,9 +1603,10 @@ |
45 |
@@ -1604,9 +1605,10 @@ class PyBuildExt(build_ext): |
| 46 |
else: |
46 |
else: |
| 47 |
missing.append('linuxaudiodev') |
47 |
missing.append('linuxaudiodev') |
| 48 |
|
48 |
|
|
Lines 56-62
Link Here
|
| 56 |
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) |
56 |
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) |
| 57 |
else: |
57 |
else: |
| 58 |
missing.append('ossaudiodev') |
58 |
missing.append('ossaudiodev') |
| 59 |
@@ -2176,6 +2178,22 @@ |
59 |
@@ -2178,6 +2180,22 @@ class PyBuildInstallLib(install_lib): |
| 60 |
def is_chmod_supported(self): |
60 |
def is_chmod_supported(self): |
| 61 |
return hasattr(os, 'chmod') |
61 |
return hasattr(os, 'chmod') |
| 62 |
|
62 |
|
|
Lines 79-85
Link Here
|
| 79 |
SUMMARY = """ |
79 |
SUMMARY = """ |
| 80 |
Python is an interpreted, interactive, object-oriented programming |
80 |
Python is an interpreted, interactive, object-oriented programming |
| 81 |
language. It is often compared to Tcl, Perl, Scheme or Java. |
81 |
language. It is often compared to Tcl, Perl, Scheme or Java. |
| 82 |
@@ -2221,7 +2239,9 @@ |
82 |
@@ -2223,7 +2241,9 @@ def main(): |
| 83 |
platforms = ["Many"], |
83 |
platforms = ["Many"], |
| 84 |
|
84 |
|
| 85 |
# Build info |
85 |
# Build info |
|
Lines 90-96
Link Here
|
| 90 |
'install_lib':PyBuildInstallLib}, |
90 |
'install_lib':PyBuildInstallLib}, |
| 91 |
# The struct module is defined here, because build_ext won't be |
91 |
# The struct module is defined here, because build_ext won't be |
| 92 |
# called unless there's at least one extension module defined. |
92 |
# called unless there's at least one extension module defined. |
| 93 |
@@ -2229,8 +2249,7 @@ |
93 |
@@ -2231,8 +2251,7 @@ def main(): |
| 94 |
|
94 |
|
| 95 |
# Scripts to install |
95 |
# Scripts to install |
| 96 |
scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', |
96 |
scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', |