2016-01-04 19:23:28 +01:00
|
|
|
From b910b3a6e61afcaa6f77b533a5cb4290c528f439 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
|
Date: Wed, 23 Dec 2015 11:36:27 +0100
|
|
|
|
Subject: [PATCH] Don't add multiarch paths
|
2014-07-08 22:17:53 +02:00
|
|
|
|
|
|
|
The add_multiarch_paths() function leads, in certain build
|
|
|
|
environments, to the addition of host header paths to the CFLAGS,
|
|
|
|
which is not appropriate for cross-compilation. This patch fixes that
|
|
|
|
by simply removing the call to add_multiarch_paths() when we're
|
|
|
|
cross-compiling.
|
|
|
|
|
|
|
|
Investigation done by David <buildroot-2014@inbox.com>.
|
|
|
|
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
2016-01-04 19:23:28 +01:00
|
|
|
---
|
|
|
|
setup.py | 2 +-
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
2014-07-08 22:17:53 +02:00
|
|
|
|
2016-01-04 19:23:28 +01:00
|
|
|
diff --git a/setup.py b/setup.py
|
|
|
|
index acc4ad0..eab709e 100644
|
2014-07-08 22:17:53 +02:00
|
|
|
--- a/setup.py
|
|
|
|
+++ b/setup.py
|
2016-01-04 19:23:28 +01:00
|
|
|
@@ -456,10 +456,10 @@ class PyBuildExt(build_ext):
|
2014-07-08 22:17:53 +02:00
|
|
|
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')
|
|
|
|
+ self.add_multiarch_paths()
|
|
|
|
# only change this for cross builds for 3.3, issues on Mageia
|
|
|
|
if cross_compiling:
|
|
|
|
self.add_gcc_paths()
|
|
|
|
- self.add_multiarch_paths()
|
|
|
|
|
|
|
|
# Add paths specified in the environment variables LDFLAGS and
|
|
|
|
# CPPFLAGS for header and library files.
|
2016-01-04 19:23:28 +01:00
|
|
|
--
|
|
|
|
2.6.4
|
|
|
|
|