summaryrefslogtreecommitdiff
path: root/package/python/python-002-cross-compile.patch
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-01-22 18:48:48 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-01-22 18:48:48 +0000
commit6440b9fd175c06263b5da2616e228e39e424cccd (patch)
tree90b0a40a00529983cf002d6bed4a901674f2ef8e /package/python/python-002-cross-compile.patch
parent92139ef20f9bfbf2e22ee9b6be0f0694fd85b710 (diff)
- fixup include- and libdirs. Closes #841
- rediff patches against 2.4.2
Diffstat (limited to 'package/python/python-002-cross-compile.patch')
-rw-r--r--package/python/python-002-cross-compile.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/package/python/python-002-cross-compile.patch b/package/python/python-002-cross-compile.patch
new file mode 100644
index 000000000..e856576d9
--- /dev/null
+++ b/package/python/python-002-cross-compile.patch
@@ -0,0 +1,44 @@
+diff -rduNp Python-2.4.2-001/setup.py Python-2.4.2/setup.py
+--- Python-2.4.2-001/setup.py 2007-01-22 19:37:08.000000000 +0100
++++ Python-2.4.2/setup.py 2007-01-22 19:41:47.000000000 +0100
+@@ -20,6 +20,14 @@ disabled_module_list = []
+ def add_dir_to_list(dirlist, dir):
+ """Add the directory 'dir' to the list 'dirlist' (at the front) if
+ 1) 'dir' is not already in 'dirlist'
++ modules_include_dirs = os.environ["PYTHON_MODULES_INCLUDE"].split()
++except KeyError:
++ modules_include_dirs = ['/usr/include']
++try:
++ modules_lib_dirs = os.environ["PYTHON_MODULES_LIB"].split()
++except KeyError:
++ modules_lib_dirs = ['/usr/lib']
++try:
+ 2) 'dir' actually exists, and is a directory."""
+ if dir is not None and os.path.isdir(dir) and dir not in dirlist:
+ dirlist.insert(0, dir)
+@@ -239,7 +247,10 @@ class PyBuildExt(build_ext):
+ return sys.platform
+
+ def detect_modules(self):
+- # Ensure that /usr/local is always used
++ for dir in modules_include_dirs:
++ add_dir_to_list(self.compiler.include_dirs, dir)
++ for dir in modules_lib_dirs:
++ add_dir_to_list(self.compiler.library_dirs, dir)
+
+ # Add paths to popular package managers on OS X/darwin
+ if sys.platform == "darwin":
+@@ -258,11 +269,8 @@ class PyBuildExt(build_ext):
+ # 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 = []
+
+ platform = self.get_platform()