summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhey Popovych <serhe.popovych@gmail.com>2018-12-14 19:54:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-15 17:10:52 +0000
commit9d2ea1ea50355987fd4a0651817fd969cd838acc (patch)
tree7d6487369f21d893bdf9434c41a5129d02e6993d
parentfb02d11cad12876432a4c8719ad8b5cb91436516 (diff)
downloadpoky-9d2ea1ea50355987fd4a0651817fd969cd838acc.tar.gz
python3: Fix do_configure check platform triplet error (2)
When building for powerpc 32bit with musl following error triggered from do_configure: checking for the platform triplet based on compiler characteristics... powerpc-linux-gnu configure: error: internal configure error for the platform triplet, please file a bug report This is caused by PLATFORM_TRIPLET != MULTIARCH mismatch since MULTIARCH in case of musl is powerpc-linux-musl. Since triplet is used as part module name as described in PEP-3149 to make fix less intrusive alias powerpc-linux-musl to powerpc-linux-gnu to avoid possible runtime (e.g. tests) incompatibilities later. Fix was inspired by commit cda0ef61d373 ("python3: fix do_configure check platform triplet error"). (From OE-Core rev: b2ec91e12088afa0560aecede587d0970fc64110) Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-musl.patch40
-rw-r--r--meta/recipes-devtools/python/python3_3.5.6.bb1
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-musl.patch b/meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-musl.patch
new file mode 100644
index 0000000000..34c91755ff
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-musl.patch
@@ -0,0 +1,40 @@
1From 7362464383bbd54f8e6be4389f2c74c0717bc6e1 Mon Sep 17 00:00:00 2001
2From: Serhey Popovych <serhe.popovych@gmail.com>
3Date: Sat, 8 Dec 2018 11:24:06 -0500
4Subject: [PATCH] configure.ac: tweak MULTIARCH for powerpc-linux-musl
5
6For musl builds, the MULTIARCH is powerpc-linux-musl and configure.ac
7does not have lines to recognize it causing configure error for the
8platform triplet when building for powerpc 32bit.
9
10This is feature described in PEP-3149 and to prevent possible runtime
11compatibility issues we map powerpc-linux-musl to powerpc-linux-gnu.
12
13Look at similar change by Hongxu Jia <hongxu.jia@> presended in
14tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch to handle p1022ds BSP
15builds.
16
17Upstream-Status: Pending
18Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
19---
20 configure.ac | 4 ++++
21 1 file changed, 4 insertions(+)
22
23diff --git a/configure.ac b/configure.ac
24index 95c98d1..1a4d8aa 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -752,6 +752,10 @@ if test x$MULTIARCH = xpowerpc-linux-gnuspev1
28 then
29 MULTIARCH="powerpc-linux-gnuspe"
30 fi
31+if test x$MULTIARCH = xpowerpc-linux-musl
32+then
33+ MULTIARCH="powerpc-linux-gnu"
34+fi
35
36 AC_SUBST(MULTIARCH)
37
38--
392.7.4
40
diff --git a/meta/recipes-devtools/python/python3_3.5.6.bb b/meta/recipes-devtools/python/python3_3.5.6.bb
index cd7991e7f8..b4f6e55535 100644
--- a/meta/recipes-devtools/python/python3_3.5.6.bb
+++ b/meta/recipes-devtools/python/python3_3.5.6.bb
@@ -13,6 +13,7 @@ file://130-readline-setup.patch \
13file://150-fix-setupterm.patch \ 13file://150-fix-setupterm.patch \
14file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ 14file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \
15file://tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch \ 15file://tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch \
16file://tweak-MULTIARCH-for-powerpc-linux-musl.patch \
16file://support_SOURCE_DATE_EPOCH_in_py_compile.patch \ 17file://support_SOURCE_DATE_EPOCH_in_py_compile.patch \
17${DISTRO_SRC_URI} \ 18${DISTRO_SRC_URI} \
18" 19"