summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJose Lamego <jose.a.lamego@linux.intel.com>2017-03-17 15:23:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-22 11:35:21 +0000
commit4ad1148e68a75d9fbaa0ec353bf9b0a20482ab99 (patch)
tree42bc4691941e012abac6cea3f639c5eafbb86c86 /meta
parent995b02b00cc04bda9b7430b16577bfddb89807b1 (diff)
downloadpoky-4ad1148e68a75d9fbaa0ec353bf9b0a20482ab99.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] (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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/python3/python-3.3-multilib.patch17
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
138 138
139 /* Get file status. Encode the path to the locale encoding. */ 139 /* Get file status. Encode the path to the locale encoding. */
140 140
141@@ -494,7 +502,7 @@ calculate_path(void)
142 _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL);
143 _prefix = Py_DecodeLocale(PREFIX, NULL);
144 _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL);
145- lib_python = Py_DecodeLocale("lib/python" VERSION, NULL);
146+ lib_python = Py_DecodeLocale(LIB_PYTHON, NULL);
147
148 if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
149 Py_FatalError(
141Index: Python-3.5.2/Python/getplatform.c 150Index: Python-3.5.2/Python/getplatform.c
142=================================================================== 151===================================================================
143--- Python-3.5.2.orig/Python/getplatform.c 152--- Python-3.5.2.orig/Python/getplatform.c
@@ -185,7 +194,7 @@ Index: Python-3.5.2/setup.py
185=================================================================== 194===================================================================
186--- Python-3.5.2.orig/setup.py 195--- Python-3.5.2.orig/setup.py
187+++ Python-3.5.2/setup.py 196+++ Python-3.5.2/setup.py
188@@ -492,7 +492,7 @@ class PyBuildExt(build_ext): 197@@ -495,7 +495,7 @@ class PyBuildExt(build_ext):
189 # directories (i.e. '.' and 'Include') must be first. See issue 198 # directories (i.e. '.' and 'Include') must be first. See issue
190 # 10520. 199 # 10520.
191 if not cross_compiling: 200 if not cross_compiling:
@@ -194,7 +203,7 @@ Index: Python-3.5.2/setup.py
194 add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') 203 add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
195 # only change this for cross builds for 3.3, issues on Mageia 204 # only change this for cross builds for 3.3, issues on Mageia
196 if cross_compiling: 205 if cross_compiling:
197@@ -550,8 +550,7 @@ class PyBuildExt(build_ext): 206@@ -553,8 +553,7 @@ class PyBuildExt(build_ext):
198 # be assumed that no additional -I,-L directives are needed. 207 # be assumed that no additional -I,-L directives are needed.
199 if not cross_compiling: 208 if not cross_compiling:
200 lib_dirs = self.compiler.library_dirs + [ 209 lib_dirs = self.compiler.library_dirs + [
@@ -204,7 +213,7 @@ Index: Python-3.5.2/setup.py
204 ] 213 ]
205 inc_dirs = self.compiler.include_dirs + ['/usr/include'] 214 inc_dirs = self.compiler.include_dirs + ['/usr/include']
206 else: 215 else:
207@@ -743,11 +742,11 @@ class PyBuildExt(build_ext): 216@@ -746,11 +745,11 @@ class PyBuildExt(build_ext):
208 elif curses_library: 217 elif curses_library:
209 readline_libs.append(curses_library) 218 readline_libs.append(curses_library)
210 elif self.compiler.find_library_file(lib_dirs + 219 elif self.compiler.find_library_file(lib_dirs +
@@ -268,7 +277,7 @@ Index: Python-3.5.2/configure.ac
268=================================================================== 277===================================================================
269--- Python-3.5.2.orig/configure.ac 278--- Python-3.5.2.orig/configure.ac
270+++ Python-3.5.2/configure.ac 279+++ Python-3.5.2/configure.ac
271@@ -876,6 +876,41 @@ PLATDIR=plat-$MACHDEP 280@@ -883,6 +883,41 @@ PLATDIR=plat-$MACHDEP
272 AC_SUBST(PLATDIR) 281 AC_SUBST(PLATDIR)
273 AC_SUBST(PLATFORM_TRIPLET) 282 AC_SUBST(PLATFORM_TRIPLET)
274 283