diff options
| author |   Jose Lamego <jose.a.lamego@linux.intel.com> | 2017-03-17 15:23:53 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-21 22:43:02 +0000 |
| commit | 9e99897f17d9c62ca5da208751d6560fc98927b6 (patch) | |
| tree | dc6589b61d1d90c3fbab9eee8439e47575078ce0 /meta/recipes-devtools | |
| parent | 18304036e1b513fd12c049dbf549ba75c503ed84 (diff) | |
| download | openembedded-core-contrib-9e99897f17d9c62ca5da208751d6560fc98927b6.tar.gz | |
python-3.3-multilib.patch: Fixes getpath on multilib configurations
When using multilib configurations either on arm/arm64 and x86/x86-64
python3 failed to execute due to a failure when looking for its
platform independent and dependent libraries.
This patch fixes this issue by assigning lib_python to the appropriate
macro.
[YOCTO #10812]
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/python/python3/python-3.3-multilib.patch | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch index 056e8e7631..860190340e 100644 --- a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch +++ b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch @@ -138,6 +138,15 @@ Index: Python-3.5.2/Modules/getpath.c /* Get file status. Encode the path to the locale encoding. */ +@@ -494,7 +502,7 @@ calculate_path(void) + _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL); + _prefix = Py_DecodeLocale(PREFIX, NULL); + _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL); +- lib_python = Py_DecodeLocale("lib/python" VERSION, NULL); ++ lib_python = Py_DecodeLocale(LIB_PYTHON, NULL); + + if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) { + Py_FatalError( Index: Python-3.5.2/Python/getplatform.c =================================================================== --- Python-3.5.2.orig/Python/getplatform.c @@ -185,7 +194,7 @@ Index: Python-3.5.2/setup.py =================================================================== --- Python-3.5.2.orig/setup.py +++ Python-3.5.2/setup.py -@@ -492,7 +492,7 @@ class PyBuildExt(build_ext): +@@ -495,7 +495,7 @@ class PyBuildExt(build_ext): # directories (i.e. '.' and 'Include') must be first. See issue # 10520. if not cross_compiling: @@ -194,7 +203,7 @@ Index: Python-3.5.2/setup.py 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: -@@ -550,8 +550,7 @@ class PyBuildExt(build_ext): +@@ -553,8 +553,7 @@ class PyBuildExt(build_ext): # be assumed that no additional -I,-L directives are needed. if not cross_compiling: lib_dirs = self.compiler.library_dirs + [ @@ -204,7 +213,7 @@ Index: Python-3.5.2/setup.py ] inc_dirs = self.compiler.include_dirs + ['/usr/include'] else: -@@ -743,11 +742,11 @@ class PyBuildExt(build_ext): +@@ -746,11 +745,11 @@ class PyBuildExt(build_ext): elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -268,7 +277,7 @@ Index: Python-3.5.2/configure.ac =================================================================== --- Python-3.5.2.orig/configure.ac +++ Python-3.5.2/configure.ac -@@ -876,6 +876,41 @@ PLATDIR=plat-$MACHDEP +@@ -883,6 +883,41 @@ PLATDIR=plat-$MACHDEP AC_SUBST(PLATDIR) AC_SUBST(PLATFORM_TRIPLET) |