diff options
| -rw-r--r-- | meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3_3.9.9.bb (renamed from meta/recipes-devtools/python/python3_3.9.7.bb) | 2 |
2 files changed, 10 insertions, 12 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..99968b81de 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,7 +1,8 @@ | |||
| 1 | From 1ad771d86728ee2ed30e202e9768d8d825f96467 Mon Sep 17 00:00:00 2001 | 1 | From d9eb634b3d2e6ba831e864c50f6a37c48edfc4f3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Matthias Schoepfer <matthias.schoepfer@ithinx.io> | 2 | From: Matthias Schoepfer <matthias.schoepfer@ithinx.io> |
| 3 | Date: Fri, 31 May 2019 15:34:34 +0200 | 3 | Date: Fri, 31 May 2019 15:34:34 +0200 |
| 4 | Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft | 4 | Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft |
| 5 | |||
| 5 | float | 6 | float |
| 6 | 7 | ||
| 7 | When (cross) compiling for softfloat mips, __mips_hard_float will not be | 8 | When (cross) compiling for softfloat mips, __mips_hard_float will not be |
| @@ -13,18 +14,18 @@ to do this in a more autoconf/autotools manner. | |||
| 13 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196] | 14 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196] |
| 14 | Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io> | 15 | Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io> |
| 15 | 16 | ||
| 16 | %% original patch: 0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch | 17 | |
| 17 | --- | 18 | --- |
| 18 | configure.ac | 175 +++++++-------------------------------------------- | 19 | configure.ac | 175 +++++++-------------------------------------------- |
| 19 | 1 file changed, 21 insertions(+), 154 deletions(-) | 20 | 1 file changed, 21 insertions(+), 154 deletions(-) |
| 20 | 21 | ||
| 21 | diff --git a/configure.ac b/configure.ac | 22 | diff --git a/configure.ac b/configure.ac |
| 22 | index ede710e..bc81b0b 100644 | 23 | index e2979a8..337182d 100644 |
| 23 | --- a/configure.ac | 24 | --- a/configure.ac |
| 24 | +++ b/configure.ac | 25 | +++ b/configure.ac |
| 25 | @@ -710,160 +710,27 @@ fi | 26 | @@ -728,160 +728,27 @@ then |
| 26 | MULTIARCH=$($CC --print-multiarch 2>/dev/null) | 27 | fi |
| 27 | AC_SUBST(MULTIARCH) | 28 | |
| 28 | 29 | ||
| 29 | -AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) | 30 | -AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) |
| 30 | -cat >> conftest.c <<EOF | 31 | -cat >> conftest.c <<EOF |
| @@ -202,8 +203,5 @@ index ede710e..bc81b0b 100644 | |||
| 202 | + ;; | 203 | + ;; |
| 203 | +esac | 204 | +esac |
| 204 | 205 | ||
| 205 | if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then | 206 | if test x$PLATFORM_TRIPLET != xdarwin; then |
| 206 | if test x$PLATFORM_TRIPLET != x$MULTIARCH; then | 207 | MULTIARCH=$($CC --print-multiarch 2>/dev/null) |
| 207 | -- | ||
| 208 | 2.24.1 | ||
| 209 | |||
diff --git a/meta/recipes-devtools/python/python3_3.9.7.bb b/meta/recipes-devtools/python/python3_3.9.9.bb index 9d26528a96..f41529833c 100644 --- a/meta/recipes-devtools/python/python3_3.9.7.bb +++ b/meta/recipes-devtools/python/python3_3.9.9.bb | |||
| @@ -38,7 +38,7 @@ SRC_URI_append_class-native = " \ | |||
| 38 | file://12-distutils-prefix-is-inside-staging-area.patch \ | 38 | file://12-distutils-prefix-is-inside-staging-area.patch \ |
| 39 | file://0001-Don-t-search-system-for-headers-libraries.patch \ | 39 | file://0001-Don-t-search-system-for-headers-libraries.patch \ |
| 40 | " | 40 | " |
| 41 | SRC_URI[sha256sum] = "f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57" | 41 | SRC_URI[sha256sum] = "06828c04a573c073a4e51c4292a27c1be4ae26621c3edc7cf9318418ce3b6d27" |
| 42 | 42 | ||
| 43 | # exclude pre-releases for both python 2.x and 3.x | 43 | # exclude pre-releases for both python 2.x and 3.x |
| 44 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" | 44 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" |
