From 460b4706494fc1e718a0dee2e4e53dbed1882fed Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 12 Aug 2020 11:42:16 +0100 Subject: [PATCH] deb-setup # DP: Don't include /usr/local/include and /usr/local/lib as gcc search paths # DP: Don't include /usr/local/include and /usr/local/lib as gcc search paths Gbp-Pq: Name deb-setup.diff --- setup.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 770866b..d6fff6d 100644 --- a/setup.py +++ b/setup.py @@ -452,8 +452,10 @@ class PyBuildExt(build_ext): # unfortunately, distutils doesn't let us provide separate C and C++ # compilers if compiler is not None: - (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS') - args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags + (ccshared, cppflags, cflags) = \ + sysconfig.get_config_vars('CCSHARED', 'CPPFLAGS', 'CFLAGS') + cppflags = ' '.join([f for f in cppflags.split() if not f.startswith('-I')]) + args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cppflags + ' ' + cflags self.compiler.set_executables(**args) def build_extensions(self): @@ -740,12 +742,7 @@ class PyBuildExt(build_ext): add_dir_to_list(dir_list, directory) def configure_compiler(self): - # Ensure that /usr/local is always used, but the local build - # directories (i.e. '.' and 'Include') must be first. See issue - # 10520. - 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') + # On Debian /usr/local is always used, so we don't include it twice # only change this for cross builds for 3.3, issues on Mageia if CROSS_COMPILING: self.add_cross_compiling_paths() -- 2.30.2