diff options
Diffstat (limited to 'meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch | 42 |
1 files changed, 23 insertions, 19 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 c4fae09a5b..4ac0e140cc 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 | |||
@@ -14,17 +14,21 @@ Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196] | |||
14 | Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io> | 14 | Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io> |
15 | 15 | ||
16 | %% original patch: 0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch | 16 | %% original patch: 0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch |
17 | |||
18 | Updated to apply after dea270a2a80214de22afadaaca2043d0d782eb7d | ||
19 | |||
20 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | ||
17 | --- | 21 | --- |
18 | configure.ac | 175 +++++++-------------------------------------------- | 22 | configure.ac | 175 +++++++-------------------------------------------- |
19 | 1 file changed, 21 insertions(+), 154 deletions(-) | 23 | 1 file changed, 21 insertions(+), 154 deletions(-) |
20 | 24 | ||
21 | diff --git a/configure.ac b/configure.ac | 25 | diff --git a/configure.ac b/configure.ac |
22 | index ede710e..bc81b0b 100644 | 26 | index de83332dd3..16b02d0798 100644 |
23 | --- a/configure.ac | 27 | --- a/configure.ac |
24 | +++ b/configure.ac | 28 | +++ b/configure.ac |
25 | @@ -710,160 +710,27 @@ fi | 29 | @@ -719,160 +719,27 @@ then |
26 | MULTIARCH=$($CC --print-multiarch 2>/dev/null) | 30 | fi |
27 | AC_SUBST(MULTIARCH) | 31 | |
28 | 32 | ||
29 | -AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) | 33 | -AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) |
30 | -cat >> conftest.c <<EOF | 34 | -cat >> conftest.c <<EOF |
@@ -185,25 +189,25 @@ index ede710e..bc81b0b 100644 | |||
185 | +## Need to handle macos, vxworks and hurd special (?) :-/ | 189 | +## Need to handle macos, vxworks and hurd special (?) :-/ |
186 | +case ${target_os} in | 190 | +case ${target_os} in |
187 | + darwin*) | 191 | + darwin*) |
188 | + PLATFORM_TRIPLET=darwin | 192 | + PLATFORM_TRIPLET=darwin |
189 | + ;; | 193 | + ;; |
190 | + hurd*) | 194 | + hurd*) |
191 | + PLATFORM_TRIPLET=i386-gnu | 195 | + PLATFORM_TRIPLET=i386-gnu |
192 | + ;; | 196 | + ;; |
193 | + vxworks*) | 197 | + vxworks*) |
194 | + PLATFORM_TRIPLET=vxworks | 198 | + PLATFORM_TRIPLET=vxworks |
195 | + ;; | 199 | + ;; |
196 | + *) | 200 | + *) |
197 | + if test "${target_cpu}" != "i686"; then | 201 | + if test "${target_cpu}" != "i686"; then |
198 | + PLATFORM_TRIPLET=${target_cpu}-${target_os} | 202 | + PLATFORM_TRIPLET=${target_cpu}-${target_os} |
199 | + else | 203 | + else |
200 | + PLATFORM_TRIPLET=i386-${target_os} | 204 | + PLATFORM_TRIPLET=i386-${target_os} |
201 | + fi | 205 | + fi |
202 | + ;; | 206 | + ;; |
203 | +esac | 207 | +esac |
204 | 208 | ||
205 | if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then | 209 | if test x$PLATFORM_TRIPLET != xdarwin; then |
206 | if test x$PLATFORM_TRIPLET != x$MULTIARCH; then | 210 | MULTIARCH=$($CC --print-multiarch 2>/dev/null) |
207 | -- | 211 | -- |
208 | 2.24.1 | 212 | 2.32.0 |
209 | 213 | ||