summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMatthias Schoepfer <matthias.schoepfer@ithinx.io>2020-03-30 11:41:11 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-31 13:58:01 +0100
commit1aa01b21b55f741344c31474bdd3db2800e9857d (patch)
treee14a53b5e3e0f4f97c49d47561464e4aaa391a76 /meta/recipes-devtools
parent6a947a90adfedbdb4b9bfd12077d6592439a2a46 (diff)
downloadpoky-1aa01b21b55f741344c31474bdd3db2800e9857d.tar.gz
python3: fixing bpo-36852 patch for builds on i686 architecture
The original patch "bpo-36852: proper detection of mips architecture for soft float" uses AC_CANONICAL_TARGET to determine the platform triplet. While AC_CANONICAL_TARGET exports i686 as target_cpu, gcc is using i386 instead. We fall back here to i386, as it is conform to the previous behavior. Upstream Status: Submitted [https://github.com/python/cpython/pull/13196] (From OE-Core rev: 6beab388e73b3ac6157650855a6c1fb1d71e8015) Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch20
1 files changed, 14 insertions, 6 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch b/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
index fe0aa8aabe..c4fae09a5b 100644
--- a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
+++ b/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
@@ -1,4 +1,4 @@
1From 2581ebe3cd9686089aed223651e1b8bf0b862b48 Mon Sep 17 00:00:00 2001 1From 1ad771d86728ee2ed30e202e9768d8d825f96467 Mon Sep 17 00:00:00 2001
2From: Matthias Schoepfer <matthias.schoepfer@ithinx.io> 2From: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
3Date: Fri, 31 May 2019 15:34:34 +0200 3Date: Fri, 31 May 2019 15:34:34 +0200
4Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft 4Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft
@@ -13,15 +13,16 @@ to do this in a more autoconf/autotools manner.
13Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196] 13Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196]
14Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io> 14Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
15 15
16%% original patch: 0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
16--- 17---
17 configure.ac | 171 +++++---------------------------------------------- 18 configure.ac | 175 +++++++--------------------------------------------
18 1 file changed, 17 insertions(+), 154 deletions(-) 19 1 file changed, 21 insertions(+), 154 deletions(-)
19 20
20diff --git a/configure.ac b/configure.ac 21diff --git a/configure.ac b/configure.ac
21index 0f85486..0ca7e24 100644 22index ede710e..bc81b0b 100644
22--- a/configure.ac 23--- a/configure.ac
23+++ b/configure.ac 24+++ b/configure.ac
24@@ -704,160 +704,23 @@ fi 25@@ -710,160 +710,27 @@ fi
25 MULTIARCH=$($CC --print-multiarch 2>/dev/null) 26 MULTIARCH=$($CC --print-multiarch 2>/dev/null)
26 AC_SUBST(MULTIARCH) 27 AC_SUBST(MULTIARCH)
27 28
@@ -193,9 +194,16 @@ index 0f85486..0ca7e24 100644
193+ PLATFORM_TRIPLET=vxworks 194+ PLATFORM_TRIPLET=vxworks
194+ ;; 195+ ;;
195+ *) 196+ *)
196+ PLATFORM_TRIPLET=${target_cpu}-${target_os} 197+ if test "${target_cpu}" != "i686"; then
198+ PLATFORM_TRIPLET=${target_cpu}-${target_os}
199+ else
200+ PLATFORM_TRIPLET=i386-${target_os}
201+ fi
197+ ;; 202+ ;;
198+esac 203+esac
199 204
200 if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then 205 if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
201 if test x$PLATFORM_TRIPLET != x$MULTIARCH; then 206 if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
207--
2082.24.1
209