diff options
-rw-r--r-- | meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch | 42 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3_3.8.13.bb (renamed from meta/recipes-devtools/python/python3_3.8.12.bb) | 6 |
2 files changed, 26 insertions, 22 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 | ||
diff --git a/meta/recipes-devtools/python/python3_3.8.12.bb b/meta/recipes-devtools/python/python3_3.8.13.bb index cfcc91b396..112ebec4c1 100644 --- a/meta/recipes-devtools/python/python3_3.8.12.bb +++ b/meta/recipes-devtools/python/python3_3.8.13.bb | |||
@@ -4,7 +4,7 @@ DESCRIPTION = "Python is a programming language that lets you work more quickly | |||
4 | LICENSE = "PSF-2.0 & BSD-0-Clause" | 4 | LICENSE = "PSF-2.0 & BSD-0-Clause" |
5 | SECTION = "devel/python" | 5 | SECTION = "devel/python" |
6 | 6 | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c22d2438294c784731bf9dd224a467b7" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c84eccf626bb6fde43e6ea5e28d8feb5" |
8 | 8 | ||
9 | SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | 9 | SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ |
10 | file://run-ptest \ | 10 | file://run-ptest \ |
@@ -42,8 +42,8 @@ SRC_URI_append_class-native = " \ | |||
42 | file://0001-Don-t-search-system-for-headers-libraries.patch \ | 42 | file://0001-Don-t-search-system-for-headers-libraries.patch \ |
43 | " | 43 | " |
44 | 44 | ||
45 | SRC_URI[md5sum] = "9dd8f82e586b776383c82e27923f8795" | 45 | SRC_URI[md5sum] = "c4b7100dcaace9d33ab1fda9a3a038d6" |
46 | SRC_URI[sha256sum] = "b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea" | 46 | SRC_URI[sha256sum] = "6f309077012040aa39fe8f0c61db8c0fa1c45136763299d375c9e5756f09cf57" |
47 | 47 | ||
48 | # exclude pre-releases for both python 2.x and 3.x | 48 | # exclude pre-releases for both python 2.x and 3.x |
49 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" | 49 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" |