diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2019-12-01 20:18:01 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2019-12-01 20:18:01 +0300 |
| commit | 77d81aa4a3747b7dfbb17e43b16e1a514550c60c (patch) | |
| tree | 0679778b3a5b46cb96d7c57485c847b83cc78bbf /debian/patches/deb-setup.diff | |
| parent | c089c4500b0b78acf03ee5405ad250a84b0dfa66 (diff) | |
| download | python3.8-debian.tar.gz | |
Import python3.8 (3.8.0-5)debian/3.8.0-5debian
Diffstat (limited to 'debian/patches/deb-setup.diff')
| -rw-r--r-- | debian/patches/deb-setup.diff | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/deb-setup.diff b/debian/patches/deb-setup.diff index 748085d..3b231c0 100644 --- a/debian/patches/deb-setup.diff +++ b/debian/patches/deb-setup.diff @@ -2,7 +2,7 @@ --- a/setup.py +++ b/setup.py -@@ -337,8 +337,10 @@ class PyBuildExt(build_ext): +@@ -385,8 +385,10 @@ class PyBuildExt(build_ext): # unfortunately, distutils doesn't let us provide separate C and C++ # compilers if compiler is not None: @@ -15,17 +15,17 @@ self.compiler.set_executables(**args) build_ext.build_extensions(self) -@@ -576,12 +578,7 @@ class PyBuildExt(build_ext): - os.unlink(tmpfile) +@@ -645,12 +647,7 @@ class PyBuildExt(build_ext): + add_dir_to_list(dir_list, directory) - def detect_modules(self): + 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: +- 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() + if CROSS_COMPILING: + self.add_cross_compiling_paths() |