diff options
| author | champtar <champetier.etienne@gmail.com> | 2017-07-19 11:46:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-19 11:46:21 -0700 |
| commit | bd8ccf184f66b8f866eac8808ba8c12be86f60c7 (patch) | |
| tree | 1195a4450c9012c52c1dd22659a15ea030f0aa9e /lang/python/python3/patches | |
| parent | c188fcfb7c4fdd9f715db872f038f4ff3bf00404 (diff) | |
| parent | 612c53fc6c3d9ba2a57f7329baf055f1d59a9246 (diff) | |
Merge pull request #4598 from commodo/fix-python-builds
python,python3: try to stabilize host builds
Diffstat (limited to 'lang/python/python3/patches')
| -rw-r--r-- | lang/python/python3/patches/006-remove-debian-multiarch-support.patch | 12 | ||||
| -rw-r--r-- | lang/python/python3/patches/006-remove-multi-arch-and-local-paths.patch | 21 |
2 files changed, 21 insertions, 12 deletions
diff --git a/lang/python/python3/patches/006-remove-debian-multiarch-support.patch b/lang/python/python3/patches/006-remove-debian-multiarch-support.patch deleted file mode 100644 index 52d52b94e..000000000 --- a/lang/python/python3/patches/006-remove-debian-multiarch-support.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.py b/setup.py -index 7868b7b..9ae0ef2 100644 ---- a/setup.py -+++ b/setup.py -@@ -444,7 +444,6 @@ class PyBuildExt(build_ext): - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - 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. diff --git a/lang/python/python3/patches/006-remove-multi-arch-and-local-paths.patch b/lang/python/python3/patches/006-remove-multi-arch-and-local-paths.patch new file mode 100644 index 000000000..ed2fdb56a --- /dev/null +++ b/lang/python/python3/patches/006-remove-multi-arch-and-local-paths.patch @@ -0,0 +1,21 @@ +diff --git a/setup.py b/setup.py +index f04bf22..01b851e 100644 +--- a/setup.py ++++ b/setup.py +@@ -487,16 +487,9 @@ 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') + # 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. |