summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-04-18 17:59:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-23 23:30:20 +0100
commit47f4ad9ff0dfd5ed25f92577eea767f809ca451e (patch)
treef7dddafe187ecfcd0367988317f2839d6a04e0ac
parente3b2e3340f88ebb14613dbd1413d210cbbeb2d90 (diff)
downloadpoky-47f4ad9ff0dfd5ed25f92577eea767f809ca451e.tar.gz
python3: add another multilib fix
(From OE-Core rev: 60502aa366f860b4f056da1bcd8fd5ee8f4495f5) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch31
-rw-r--r--meta/recipes-devtools/python/python3_3.7.3.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch
new file mode 100644
index 0000000000..b97583682a
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch
@@ -0,0 +1,31 @@
1From a21f4f8fa5e5c0601898740b4ac08ec84f41e190 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 18 Apr 2019 17:11:06 +0200
4Subject: [PATCH] Lib/sysconfig.py: fix another place where 'lib' is hardcoded
5 as the library path
6
7Upstream-Status: Inappropriate [oe-core specific]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 Lib/sysconfig.py | 8 ++++----
11 1 file changed, 4 insertions(+), 4 deletions(-)
12
13diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
14index d15cec8..87fa5e6 100644
15--- a/Lib/sysconfig.py
16+++ b/Lib/sysconfig.py
17@@ -20,10 +20,10 @@ __all__ = [
18
19 _INSTALL_SCHEMES = {
20 'posix_prefix': {
21- 'stdlib': '{installed_base}/lib/python{py_version_short}',
22- 'platstdlib': '{platbase}/lib/python{py_version_short}',
23- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
24- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
25+ 'stdlib': '{LIBDEST}',
26+ 'platstdlib': '{LIBDEST}',
27+ 'purelib': '{LIBDEST}/site-packages',
28+ 'platlib': '{LIBDEST}/site-packages',
29 'include':
30 '{installed_base}/include/python{py_version_short}{abiflags}',
31 'platinclude':
diff --git a/meta/recipes-devtools/python/python3_3.7.3.bb b/meta/recipes-devtools/python/python3_3.7.3.bb
index ea46b0535b..3a1c8f5be6 100644
--- a/meta/recipes-devtools/python/python3_3.7.3.bb
+++ b/meta/recipes-devtools/python/python3_3.7.3.bb
@@ -22,6 +22,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
22 file://0002-Don-t-do-runtime-test-to-get-float-byte-order.patch \ 22 file://0002-Don-t-do-runtime-test-to-get-float-byte-order.patch \
23 file://0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ 23 file://0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
24 file://ptesthack.patch \ 24 file://ptesthack.patch \
25 file://0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch \
25 " 26 "
26 27
27SRC_URI_append_class-native = " \ 28SRC_URI_append_class-native = " \