| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Do not hardcode /usr into include paths when cross compiling |
| 2 | |
| 3 | -Khem |
| 4 | |
| 5 | Upstream-Status: Pending |
| 6 | |
| 7 | --- |
| 8 | setup.py | 15 ++------------- |
| 9 | 1 file changed, 2 insertions(+), 13 deletions(-) |
| 10 | |
| 11 | Index: Python-3.3.2/setup.py |
| 12 | =================================================================== |
| 13 | --- Python-3.3.2.orig/setup.py |
| 14 | +++ Python-3.3.2/setup.py |
| 15 | @@ -444,7 +444,8 @@ class PyBuildExt(build_ext): |
| 16 | # only change this for cross builds for 3.3, issues on Mageia |
| 17 | if cross_compiling: |
| 18 | self.add_gcc_paths() |
| 19 | - self.add_multiarch_paths() |
| 20 | + if not cross_compiling: |
| 21 | + self.add_multiarch_paths() |
| 22 | |
| 23 | # Add paths specified in the environment variables LDFLAGS and |
| 24 | # CPPFLAGS for header and library files. |
| 25 | @@ -480,7 +481,7 @@ class PyBuildExt(build_ext): |
| 26 | for directory in reversed(options.dirs): |
| 27 | add_dir_to_list(dir_list, directory) |
| 28 | |
| 29 | - if os.path.normpath(sys.base_prefix) != '/usr' \ |
| 30 | + if not cross_compiling and os.path.normpath(sys.base_prefix) != '/usr' \ |
| 31 | and not sysconfig.get_config_var('PYTHONFRAMEWORK'): |
| 32 | # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework |
| 33 | # (PYTHONFRAMEWORK is set) to avoid # linking problems when |