diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2017-09-29 13:40:02 +0300 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2017-09-29 13:40:02 +0300 |
commit | 424a50000a78fff715de4417dba9b4498aeeee4c (patch) | |
tree | d27f003c7d140fef24efd1b2ca1325ae099154b9 /debian/patches/deb-setup.diff | |
download | python3.5-debian.tar.gz |
Imported python3.5 3.5.4-4debian/3.5.4-4debian
Diffstat (limited to 'debian/patches/deb-setup.diff')
-rw-r--r-- | debian/patches/deb-setup.diff | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/debian/patches/deb-setup.diff b/debian/patches/deb-setup.diff new file mode 100644 index 0000000..08ce316 --- /dev/null +++ b/debian/patches/deb-setup.diff @@ -0,0 +1,33 @@ +# DP: Don't include /usr/local/include and /usr/local/lib as gcc search paths + +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -262,8 +262,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) + + build_ext.build_extensions(self) +@@ -487,12 +489,7 @@ class PyBuildExt(build_ext): + return ['m'] + + def detect_modules(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_gcc_paths() |