|
@@ -1,6 +1,7 @@
|
|
|
+diff -Nur Python-2.7.orig/setup.py Python-2.7/setup.py
|
|
|
--- Python-2.7.orig/setup.py 2010-06-27 14:36:16.000000000 +0200
|
|
|
-+++ Python-2.7/setup.py 2010-11-04 22:25:30.000000000 +0100
|
|
|
-@@ -21,7 +21,7 @@ from distutils.spawn import find_executa
|
|
|
++++ Python-2.7/setup.py 2010-12-11 02:28:23.000000000 +0100
|
|
|
+@@ -21,7 +21,7 @@
|
|
|
COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
|
|
|
|
|
|
# This global variable is used to hold the list of modules to be disabled.
|
|
@@ -9,7 +10,7 @@
|
|
|
|
|
|
def add_dir_to_list(dirlist, dir):
|
|
|
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
|
|
|
-@@ -307,36 +307,6 @@ class PyBuildExt(build_ext):
|
|
|
+@@ -307,48 +307,14 @@
|
|
|
ext_filename = os.path.join(
|
|
|
self.build_lib,
|
|
|
self.get_ext_filename(self.get_ext_fullname(ext.name)))
|
|
@@ -45,8 +46,12 @@
|
|
|
- self.failed.append(ext.name)
|
|
|
|
|
|
def get_platform(self):
|
|
|
- # Get value of sys.platform
|
|
|
-@@ -347,8 +317,8 @@ class PyBuildExt(build_ext):
|
|
|
+- # Get value of sys.platform
|
|
|
+- for platform in ['cygwin', 'beos', 'darwin', 'atheos', 'osf1']:
|
|
|
+- if sys.platform.startswith(platform):
|
|
|
+- return platform
|
|
|
+- return sys.platform
|
|
|
++ return 'linux'
|
|
|
|
|
|
def detect_modules(self):
|
|
|
# Ensure that /usr/local is always used
|
|
@@ -57,3 +62,17 @@
|
|
|
|
|
|
# Add paths specified in the environment variables LDFLAGS and
|
|
|
# CPPFLAGS for header and library files.
|
|
|
+@@ -398,11 +364,8 @@
|
|
|
+ # lib_dirs and inc_dirs are used to search for files;
|
|
|
+ # if a file is found in one of those directories, it can
|
|
|
+ # be assumed that no additional -I,-L directives are needed.
|
|
|
+- lib_dirs = self.compiler.library_dirs + [
|
|
|
+- '/lib64', '/usr/lib64',
|
|
|
+- '/lib', '/usr/lib',
|
|
|
+- ]
|
|
|
+- inc_dirs = self.compiler.include_dirs + ['/usr/include']
|
|
|
++ lib_dirs = self.compiler.library_dirs
|
|
|
++ inc_dirs = self.compiler.include_dirs
|
|
|
+ exts = []
|
|
|
+ missing = []
|
|
|
+
|