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] (From OE-Core rev: 9e99897f17d9c62ca5da208751d6560fc98927b6) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
995b02b00c
commit
4ad1148e68
|
@ -138,6 +138,15 @@ Index: Python-3.5.2/Modules/getpath.c
|
||||||
|
|
||||||
/* Get file status. Encode the path to the locale encoding. */
|
/* 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
|
Index: Python-3.5.2/Python/getplatform.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- Python-3.5.2.orig/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.orig/setup.py
|
||||||
+++ Python-3.5.2/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
|
# directories (i.e. '.' and 'Include') must be first. See issue
|
||||||
# 10520.
|
# 10520.
|
||||||
if not cross_compiling:
|
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')
|
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
||||||
# only change this for cross builds for 3.3, issues on Mageia
|
# only change this for cross builds for 3.3, issues on Mageia
|
||||||
if cross_compiling:
|
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.
|
# be assumed that no additional -I,-L directives are needed.
|
||||||
if not cross_compiling:
|
if not cross_compiling:
|
||||||
lib_dirs = self.compiler.library_dirs + [
|
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']
|
inc_dirs = self.compiler.include_dirs + ['/usr/include']
|
||||||
else:
|
else:
|
||||||
@@ -743,11 +742,11 @@ class PyBuildExt(build_ext):
|
@@ -746,11 +745,11 @@ class PyBuildExt(build_ext):
|
||||||
elif curses_library:
|
elif curses_library:
|
||||||
readline_libs.append(curses_library)
|
readline_libs.append(curses_library)
|
||||||
elif self.compiler.find_library_file(lib_dirs +
|
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.orig/configure.ac
|
||||||
+++ Python-3.5.2/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(PLATDIR)
|
||||||
AC_SUBST(PLATFORM_TRIPLET)
|
AC_SUBST(PLATFORM_TRIPLET)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue