summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2016-03-11 02:40:22 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-12 22:11:46 +0000
commit3d45853eef1269b455d840a60491802251368378 (patch)
tree11730dc1df7ca78e600d3472f2b89f79f3012090
parent03b167d49d75bf9146db5fef29d4085eb944f090 (diff)
downloadpoky-3d45853eef1269b455d840a60491802251368378.tar.gz
python3: fix do_configure check platform triplet error
For p1022ds bsp, the MULTIARCH is powerpc-linux-gnuspev1 and python3 did not recognize the extra 'v1' which caused python3 configure error for the platform triplet. Q:Why Python3 check platform triplet? A:Under Linux, GNU/KFreeBSD and the Hurd, C extensions now include the architecture triplet in the extension name, to make it easy to test builds for different ABIs in the same working tree. vim config.log ... EXT_SUFFIX='.cpython-35m-powerpc-linux-gnuspe.so' ... Here is the generated C extensions which take platform triplet into account. ... |image/usr/lib/python3.5/lib-dynload/_datetime.cpython-35m-powerpc-linux-gnuspe.so ... https://bugs.python.org/issue22980 https://www.python.org/dev/peps/pep-3149/ https://bugs.python.org/review/22980/patch/14593/54808 [YOCTO #9226] (From OE-Core rev: cda0ef61d37357fed1daa22f6a59ef9f906fcada) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch52
-rw-r--r--meta/recipes-devtools/python/python3_3.5.1.bb1
2 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch b/meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch
new file mode 100644
index 0000000000..8d037278bd
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch
@@ -0,0 +1,52 @@
1From 5d6509313198ec9b686cad50b002212e4344004b Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 11 Mar 2016 01:15:45 -0500
4Subject: [PATCH] configure.ac: tweak MULTIARCH for powerpc-linux-gnuspe
5
6For p1022ds bsp, the MULTIARCH is powerpc-linux-gnuspev1 and
7python3 did not recognize the extra 'v1' which caused python3
8configure error for the platform triplet.
9
10Q:Why Python3 check platform triplet?
11
12A:Under Linux, GNU/KFreeBSD and the Hurd, C extensions now include
13the architecture triplet in the extension name, to make it easy to
14test builds for different ABIs in the same working tree.
15
16Here is the generated C extensions which take platform triplet into account.
17...
18|image/usr/lib/python3.5/lib-dynload/_datetime.cpython-35m-powerpc-linux-gnuspe.so
19...
20
21https://bugs.python.org/issue22980
22https://www.python.org/dev/peps/pep-3149/
23https://bugs.python.org/review/22980/patch/14593/54808
24
25Upstream-Status: Pending
26
27Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
28---
29 configure.ac | 7 +++++++
30 1 file changed, 7 insertions(+)
31
32diff --git a/configure.ac b/configure.ac
33index 9eb3d22..c34a9a0 100644
34--- a/configure.ac
35+++ b/configure.ac
36@@ -724,6 +724,13 @@ fi
37
38
39 MULTIARCH=$($CC --print-multiarch 2>/dev/null)
40+
41+# Tweak MULTIARCH
42+if test x$MULTIARCH = xpowerpc-linux-gnuspev1
43+then
44+ MULTIARCH="powerpc-linux-gnuspe"
45+fi
46+
47 AC_SUBST(MULTIARCH)
48
49 AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])
50--
511.9.1
52
diff --git a/meta/recipes-devtools/python/python3_3.5.1.bb b/meta/recipes-devtools/python/python3_3.5.1.bb
index 11f959b161..2fbb3cbc30 100644
--- a/meta/recipes-devtools/python/python3_3.5.1.bb
+++ b/meta/recipes-devtools/python/python3_3.5.1.bb
@@ -17,6 +17,7 @@ file://110-enable-zlib.patch \
17file://130-readline-setup.patch \ 17file://130-readline-setup.patch \
18file://150-fix-setupterm.patch \ 18file://150-fix-setupterm.patch \
19file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ 19file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \
20file://tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch \
20${DISTRO_SRC_URI} \ 21${DISTRO_SRC_URI} \
21" 22"
22 23