summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch22
-rw-r--r--meta/recipes-devtools/python/python3_3.9.4.bb (renamed from meta/recipes-devtools/python/python3_3.9.2.bb)4
2 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch
index 35b7e0c480..c3d1e06d00 100644
--- a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch
+++ b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch
@@ -23,24 +23,24 @@ Before this patch:
23 23
24Upstream-Status: Submitted [https://github.com/python/cpython/pull/15132] 24Upstream-Status: Submitted [https://github.com/python/cpython/pull/15132]
25 25
26
27Rebased for 3.9.4, still not accepted upstream Signed-off-by: Alejandro Hernandez <alejandro@enedino.org>
28
26Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 29Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
27--- 30---
28 Lib/test/test_locale.py | 2 +- 31 Lib/test/test_locale.py | 2 +-
29 1 file changed, 1 insertion(+), 1 deletion(-) 32 1 file changed, 1 insertion(+), 1 deletion(-)
30 33
31diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py 34Index: Python-3.9.4/Lib/test/test_locale.py
32index e2c2178..558d63c 100644 35===================================================================
33--- a/Lib/test/test_locale.py 36--- Python-3.9.4.orig/Lib/test/test_locale.py
34+++ b/Lib/test/test_locale.py 37+++ Python-3.9.4/Lib/test/test_locale.py
35@@ -527,7 +527,7 @@ class TestMiscellaneous(unittest.TestCase): 38@@ -562,7 +562,7 @@ class TestMiscellaneous(unittest.TestCas
36 self.skipTest('test needs Turkish locale') 39 self.skipTest('test needs Turkish locale')
37 loc = locale.getlocale(locale.LC_CTYPE) 40 loc = locale.getlocale(locale.LC_CTYPE)
38 if verbose: 41 if verbose:
39- print('testing with %a' % (loc,), end=' ', flush=True) 42- print('testing with %a' % (loc,), end=' ', flush=True)
40+ print('testing with %a...' % (loc,), end=' ', flush=True) 43+ print('testing with %a...' % (loc,), end=' ', flush=True)
41 locale.setlocale(locale.LC_CTYPE, loc) 44 try:
42 self.assertEqual(loc, locale.getlocale(locale.LC_CTYPE)) 45 locale.setlocale(locale.LC_CTYPE, loc)
43 46 except locale.Error as exc:
44--
452.7.4
46
diff --git a/meta/recipes-devtools/python/python3_3.9.2.bb b/meta/recipes-devtools/python/python3_3.9.4.bb
index fd1172335a..cb371ceed7 100644
--- a/meta/recipes-devtools/python/python3_3.9.2.bb
+++ b/meta/recipes-devtools/python/python3_3.9.4.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 "
41SRC_URI[sha256sum] = "3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d" 41SRC_URI[sha256sum] = "4b0e6644a76f8df864ae24ac500a51bbf68bd098f6a173e27d3b61cdca9aa134"
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
44UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" 44UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
@@ -69,7 +69,7 @@ ALTERNATIVE_LINK_NAME[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config
69ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}" 69ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}"
70 70
71 71
72DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2" 72DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2 autoconf-archive-native"
73DEPENDS_append_class-target = " python3-native" 73DEPENDS_append_class-target = " python3-native"
74DEPENDS_append_class-nativesdk = " python3-native" 74DEPENDS_append_class-nativesdk = " python3-native"
75 75