summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/python/python3')
-rw-r--r--meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch4
-rw-r--r--meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch2
-rw-r--r--meta/recipes-devtools/python/python3/0001-gh-90548-Skip-NODEV-portion-of-test_makedev-when-lin.patch24
-rw-r--r--meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch2
4 files changed, 4 insertions, 28 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch b/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch
index 075737e7d1..327124e4e3 100644
--- a/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch
+++ b/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch
@@ -1441,8 +1441,8 @@ index eae0e0c..fb06f63 100755
1441+++ b/Tools/ssl/multissltests.py 1441+++ b/Tools/ssl/multissltests.py
1442@@ -51,6 +51,7 @@ OPENSSL_RECENT_VERSIONS = [ 1442@@ -51,6 +51,7 @@ OPENSSL_RECENT_VERSIONS = [
1443 "3.1.7", 1443 "3.1.7",
1444 "3.2.3", 1444 "3.2.6",
1445 "3.3.2", 1445 "3.3.5",
1446+ "3.4.0", 1446+ "3.4.0",
1447 ] 1447 ]
1448 1448
diff --git a/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch b/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch
index ab433d1836..adaca4ff77 100644
--- a/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch
+++ b/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch
@@ -25,7 +25,7 @@ diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
25index 1ade492..4e94889 100644 25index 1ade492..4e94889 100644
26--- a/Lib/test/test_sysconfig.py 26--- a/Lib/test/test_sysconfig.py
27+++ b/Lib/test/test_sysconfig.py 27+++ b/Lib/test/test_sysconfig.py
28@@ -423,7 +423,7 @@ class TestSysConfig(unittest.TestCase): 28@@ -430,7 +430,7 @@ class TestSysConfig(unittest.TestCase):
29 expected = os.path.normpath(global_path.replace(base, user, 1)) 29 expected = os.path.normpath(global_path.replace(base, user, 1))
30 # bpo-44860: platlib of posix_user doesn't use sys.platlibdir, 30 # bpo-44860: platlib of posix_user doesn't use sys.platlibdir,
31 # whereas posix_prefix does. 31 # whereas posix_prefix does.
diff --git a/meta/recipes-devtools/python/python3/0001-gh-90548-Skip-NODEV-portion-of-test_makedev-when-lin.patch b/meta/recipes-devtools/python/python3/0001-gh-90548-Skip-NODEV-portion-of-test_makedev-when-lin.patch
deleted file mode 100644
index 4390e086d0..0000000000
--- a/meta/recipes-devtools/python/python3/0001-gh-90548-Skip-NODEV-portion-of-test_makedev-when-lin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 2dc5e9f4c82888dbe21bd1eadb4b59b0efa9608c Mon Sep 17 00:00:00 2001
2From: Zachary Ware <zach@python.org>
3Date: Sat, 6 Sep 2025 13:20:12 -0500
4Subject: [PATCH] gh-90548: Skip NODEV portion of test_makedev when linked to musl
5
6Upstream-Status: Backport [https://github.com/python/cpython/pull/138593]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 Lib/test/test_posix.py | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
13index c9cbe15..bfc1e2b 100644
14--- a/Lib/test/test_posix.py
15+++ b/Lib/test/test_posix.py
16@@ -757,7 +757,7 @@ class PosixTester(unittest.TestCase):
17 self.assertRaises((ValueError, OverflowError), posix.makedev, x, minor)
18 self.assertRaises((ValueError, OverflowError), posix.makedev, major, x)
19
20- if sys.platform == 'linux':
21+ if sys.platform == 'linux' and not support.linked_to_musl():
22 NODEV = -1
23 self.assertEqual(posix.major(NODEV), NODEV)
24 self.assertEqual(posix.minor(NODEV), NODEV)
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 3fc3a7e8ce..189246911b 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
@@ -34,7 +34,7 @@ diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
34index da4bd79..fd9e67d 100644 34index da4bd79..fd9e67d 100644
35--- a/Lib/test/test_locale.py 35--- a/Lib/test/test_locale.py
36+++ b/Lib/test/test_locale.py 36+++ b/Lib/test/test_locale.py
37@@ -502,7 +502,7 @@ class TestRealLocales(unittest.TestCase): 37@@ -501,7 +501,7 @@ class TestRealLocales(unittest.TestCase):
38 self.skipTest('test needs Turkish locale') 38 self.skipTest('test needs Turkish locale')
39 loc = locale.getlocale(locale.LC_CTYPE) 39 loc = locale.getlocale(locale.LC_CTYPE)
40 if verbose: 40 if verbose: