summaryrefslogtreecommitdiff
path: root/dev-lang/python/files/python-2.7.5-library-path.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang/python/files/python-2.7.5-library-path.patch')
-rw-r--r--dev-lang/python/files/python-2.7.5-library-path.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/dev-lang/python/files/python-2.7.5-library-path.patch b/dev-lang/python/files/python-2.7.5-library-path.patch
new file mode 100644
index 000000000000..6f435750a209
--- /dev/null
+++ b/dev-lang/python/files/python-2.7.5-library-path.patch
@@ -0,0 +1,25 @@
+# HG changeset patch
+# User Ned Deily <nad@acm.org>
+# Date 1368666045 25200
+# Node ID cd577c3288860b0deb459443ca5c489dc0f99ef6
+# Parent 149340b3004acfcb68e5ed36b1e96b7463c756c7
+Issue #17990: Only modify include and library search paths when cross-compiling.
+
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -437,9 +437,11 @@ class PyBuildExt(build_ext):
+
+ def detect_modules(self):
+ # Ensure that /usr/local is always used
+- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+- self.add_gcc_paths()
++ if not cross_compiling:
++ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
++ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++ if cross_compiling:
++ self.add_gcc_paths()
+ self.add_multiarch_paths()
+
+ # Add paths specified in the environment variables LDFLAGS and