1*4882a593SmuzhiyunFrom f5933b8f973cd11698b52d535a10d0474e49f5a5 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 3*4882a593SmuzhiyunDate: Wed, 23 Dec 2015 11:36:27 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Don't add multiarch paths 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe add_multiarch_paths() function leads, in certain build 7*4882a593Smuzhiyunenvironments, to the addition of host header paths to the CFLAGS, 8*4882a593Smuzhiyunwhich is not appropriate for cross-compilation. This patch fixes that 9*4882a593Smuzhiyunby simply removing the call to add_multiarch_paths() when we're 10*4882a593Smuzhiyuncross-compiling. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunInvestigation done by David <buildroot-2014@inbox.com>. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunSigned-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun setup.py | 2 +- 17*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/setup.py b/setup.py 20*4882a593Smuzhiyunindex ec3ba60607..e27620035c 100644 21*4882a593Smuzhiyun--- a/setup.py 22*4882a593Smuzhiyun+++ b/setup.py 23*4882a593Smuzhiyun@@ -830,10 +830,10 @@ class PyBuildExt(build_ext): 24*4882a593Smuzhiyun if not CROSS_COMPILING: 25*4882a593Smuzhiyun add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') 26*4882a593Smuzhiyun add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') 27*4882a593Smuzhiyun+ self.add_multiarch_paths() 28*4882a593Smuzhiyun # only change this for cross builds for 3.3, issues on Mageia 29*4882a593Smuzhiyun if CROSS_COMPILING: 30*4882a593Smuzhiyun self.add_cross_compiling_paths() 31*4882a593Smuzhiyun- self.add_multiarch_paths() 32*4882a593Smuzhiyun self.add_ldflags_cppflags() 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun def init_inc_lib_dirs(self): 35*4882a593Smuzhiyun-- 36*4882a593Smuzhiyun2.25.1 37*4882a593Smuzhiyun 38