diff options
Diffstat (limited to 'meta')
15 files changed, 111 insertions, 174 deletions
diff --git a/meta/classes-recipe/python3-dir.bbclass b/meta/classes-recipe/python3-dir.bbclass index 912c67253c..d93d337f76 100644 --- a/meta/classes-recipe/python3-dir.bbclass +++ b/meta/classes-recipe/python3-dir.bbclass | |||
@@ -4,7 +4,7 @@ | |||
4 | # SPDX-License-Identifier: MIT | 4 | # SPDX-License-Identifier: MIT |
5 | # | 5 | # |
6 | 6 | ||
7 | PYTHON_BASEVERSION = "3.10" | 7 | PYTHON_BASEVERSION = "3.11" |
8 | PYTHON_ABI = "" | 8 | PYTHON_ABI = "" |
9 | PYTHON_DIR = "python${PYTHON_BASEVERSION}" | 9 | PYTHON_DIR = "python${PYTHON_BASEVERSION}" |
10 | PYTHON_PN = "python3" | 10 | PYTHON_PN = "python3" |
diff --git a/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch b/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch index 62ef6efc28..16a4185704 100644 --- a/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch +++ b/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 80f872e4573f542d33f91514538755557d566f79 Mon Sep 17 00:00:00 2001 | 1 | From 93ae2ed3fc8be0245e35063c4f63626792f4cd0c Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 25 Jan 2019 19:04:13 +0100 | 3 | Date: Fri, 25 Jan 2019 19:04:13 +0100 |
4 | Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoid host | 4 | Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoid host |
@@ -12,14 +12,14 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
12 | 1 file changed, 1 deletion(-) | 12 | 1 file changed, 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/setup.py b/setup.py | 14 | diff --git a/setup.py b/setup.py |
15 | index 43e807f..11b5cf5 100644 | 15 | index 15d0d45..37ed244 100644 |
16 | --- a/setup.py | 16 | --- a/setup.py |
17 | +++ b/setup.py | 17 | +++ b/setup.py |
18 | @@ -1149,7 +1149,6 @@ class PyBuildExt(build_ext): | 18 | @@ -1109,7 +1109,6 @@ class PyBuildExt(build_ext): |
19 | 'termcap'): | 19 | 'termcap'): |
20 | readline_libs.append('termcap') | 20 | readline_libs.append('termcap') |
21 | self.add(Extension('readline', ['readline.c'], | 21 | self.add(Extension('readline', ['readline.c'], |
22 | - library_dirs=['/usr/lib/termcap'], | 22 | - library_dirs=['/usr/lib/termcap'], |
23 | extra_link_args=readline_extra_link_args, | ||
24 | libraries=readline_libs)) | 23 | libraries=readline_libs)) |
25 | else: | 24 | else: |
25 | self.missing.append('readline') | ||
diff --git a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch index c790c7b886..d6d9e451ff 100644 --- a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch +++ b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7589ab03ad3f7cb4bb092c31273ff22371ac77e4 Mon Sep 17 00:00:00 2001 | 1 | From 910a905aaeb6edb6b042ef65b3e2b73faada80aa Mon Sep 17 00:00:00 2001 |
2 | From: Jeremy Puhlman <jpuhlman@mvista.com> | 2 | From: Jeremy Puhlman <jpuhlman@mvista.com> |
3 | Date: Wed, 4 Mar 2020 00:06:42 +0000 | 3 | Date: Wed, 4 Mar 2020 00:06:42 +0000 |
4 | Subject: [PATCH] Don't search system for headers/libraries | 4 | Subject: [PATCH] Don't search system for headers/libraries |
@@ -11,10 +11,10 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> | |||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | 11 | 1 file changed, 2 insertions(+), 2 deletions(-) |
12 | 12 | ||
13 | diff --git a/setup.py b/setup.py | 13 | diff --git a/setup.py b/setup.py |
14 | index c3a6b5e..c892537 100644 | 14 | index f29ac86..930cb20 100644 |
15 | --- a/setup.py | 15 | --- a/setup.py |
16 | +++ b/setup.py | 16 | +++ b/setup.py |
17 | @@ -856,8 +856,8 @@ class PyBuildExt(build_ext): | 17 | @@ -877,8 +877,8 @@ class PyBuildExt(build_ext): |
18 | add_dir_to_list(self.compiler.include_dirs, | 18 | add_dir_to_list(self.compiler.include_dirs, |
19 | sysconfig.get_config_var("INCLUDEDIR")) | 19 | sysconfig.get_config_var("INCLUDEDIR")) |
20 | 20 | ||
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch index 641017edd5..2f519e4917 100644 --- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch +++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d82cb96eed1098920ad3cdcb36feb32137618066 Mon Sep 17 00:00:00 2001 | 1 | From 05d676ddf675d9c8229b723e64717aa485d6809e Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Fri, 10 Sep 2021 12:28:31 +0200 | 3 | Date: Fri, 10 Sep 2021 12:28:31 +0200 |
4 | Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration | 4 | Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration |
@@ -15,11 +15,11 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> | |||
15 | 1 file changed, 5 insertions(+) | 15 | 1 file changed, 5 insertions(+) |
16 | 16 | ||
17 | diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py | 17 | diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py |
18 | index e64bcdc..40c6b3e 100644 | 18 | index 93c6f73..ff399e2 100644 |
19 | --- a/Lib/sysconfig.py | 19 | --- a/Lib/sysconfig.py |
20 | +++ b/Lib/sysconfig.py | 20 | +++ b/Lib/sysconfig.py |
21 | @@ -613,6 +613,11 @@ def get_config_vars(*args): | 21 | @@ -668,6 +668,11 @@ def get_config_vars(*args): |
22 | _init_non_posix(_CONFIG_VARS) | 22 | _CONFIG_VARS['VPATH'] = sys._vpath |
23 | if os.name == 'posix': | 23 | if os.name == 'posix': |
24 | _init_posix(_CONFIG_VARS) | 24 | _init_posix(_CONFIG_VARS) |
25 | + _CONFIG_VARS['installed_base'] = _CONFIG_VARS['prefix'] | 25 | + _CONFIG_VARS['installed_base'] = _CONFIG_VARS['prefix'] |
@@ -27,6 +27,6 @@ index e64bcdc..40c6b3e 100644 | |||
27 | + _CONFIG_VARS['installed_platbase'] = _CONFIG_VARS['prefix'] | 27 | + _CONFIG_VARS['installed_platbase'] = _CONFIG_VARS['prefix'] |
28 | + _CONFIG_VARS['platbase'] = _CONFIG_VARS['prefix'] | 28 | + _CONFIG_VARS['platbase'] = _CONFIG_VARS['prefix'] |
29 | + _CONFIG_VARS['platlibdir'] = _CONFIG_VARS['PLATLIBDIR'] | 29 | + _CONFIG_VARS['platlibdir'] = _CONFIG_VARS['PLATLIBDIR'] |
30 | # For backward compatibility, see issue19555 | 30 | if _HAS_USER_BASE: |
31 | SO = _CONFIG_VARS.get('EXT_SUFFIX') | 31 | # Setting 'userbase' is done below the call to the |
32 | if SO is not None: | 32 | # init function to enable using 'get_config_var' in |
diff --git a/meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patch b/meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patch deleted file mode 100644 index e19df08f87..0000000000 --- a/meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
3 | |||
4 | From 8103b90148e8768456c3ab707de105d63d9d5b20 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@arm.com> | ||
6 | Date: Fri, 17 Jun 2022 11:53:59 +0100 | ||
7 | Subject: [PATCH] Mitigate the race condition in testSockName | ||
8 | |||
9 | find_unused_port() has an inherent race condition, but we can't use | ||
10 | bind_port() as that uses .getsockname() which this test is exercising. | ||
11 | |||
12 | Try binding to unused ports a few times before failing. | ||
13 | --- | ||
14 | Lib/test/test_socket.py | 15 +++++++++++++-- | ||
15 | 1 file changed, 13 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py | ||
18 | index c981903824..b1630d18b6 100644 | ||
19 | --- a/Lib/test/test_socket.py | ||
20 | +++ b/Lib/test/test_socket.py | ||
21 | @@ -1390,10 +1390,21 @@ def testStringToIPv6(self): | ||
22 | |||
23 | def testSockName(self): | ||
24 | # Testing getsockname() | ||
25 | - port = socket_helper.find_unused_port() | ||
26 | sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) | ||
27 | self.addCleanup(sock.close) | ||
28 | - sock.bind(("0.0.0.0", port)) | ||
29 | + | ||
30 | + # Since find_unused_port() is inherently subject to race conditions, we | ||
31 | + # call it a couple times if necessary. | ||
32 | + for i in itertools.count(): | ||
33 | + port = socket_helper.find_unused_port() | ||
34 | + try: | ||
35 | + sock.bind(("0.0.0.0", port)) | ||
36 | + except OSError as e: | ||
37 | + if e.errno != errno.EADDRINUSE or i == 5: | ||
38 | + raise | ||
39 | + else: | ||
40 | + break | ||
41 | + | ||
42 | name = sock.getsockname() | ||
43 | # XXX(nnorwitz): http://tinyurl.com/os5jz seems to indicate | ||
44 | # it reasonable to get the host's addr in addition to 0.0.0.0. | ||
45 | -- | ||
46 | 2.25.1 | ||
47 | |||
diff --git a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch index 96c5a3c840..61dd4a5bc0 100644 --- a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch +++ b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7171aeee22a0b7ab57cdf3d1ae15530549f8f92a Mon Sep 17 00:00:00 2001 | 1 | From 01e02fb4720ecbbc44c694ee1b7fb6d5d95b5fe2 Mon Sep 17 00:00:00 2001 |
2 | From: Yi Fan Yu <yifan.yu@windriver.com> | 2 | From: Yi Fan Yu <yifan.yu@windriver.com> |
3 | Date: Thu, 1 Apr 2021 13:08:37 -0700 | 3 | Date: Thu, 1 Apr 2021 13:08:37 -0700 |
4 | Subject: [PATCH] Skip failing tests due to load variability on YP AB | 4 | Subject: [PATCH] Skip failing tests due to load variability on YP AB |
@@ -17,10 +17,10 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | |||
17 | 2 files changed, 3 insertions(+) | 17 | 2 files changed, 3 insertions(+) |
18 | 18 | ||
19 | diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py | 19 | diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py |
20 | index 3bc5b8f..a6e106d 100644 | 20 | index 599c3f2..23328be 100644 |
21 | --- a/Lib/test/_test_multiprocessing.py | 21 | --- a/Lib/test/_test_multiprocessing.py |
22 | +++ b/Lib/test/_test_multiprocessing.py | 22 | +++ b/Lib/test/_test_multiprocessing.py |
23 | @@ -568,6 +568,7 @@ class _TestProcess(BaseTestCase): | 23 | @@ -618,6 +618,7 @@ class _TestProcess(BaseTestCase): |
24 | 24 | ||
25 | close_queue(q) | 25 | close_queue(q) |
26 | 26 | ||
@@ -28,7 +28,7 @@ index 3bc5b8f..a6e106d 100644 | |||
28 | def test_many_processes(self): | 28 | def test_many_processes(self): |
29 | if self.TYPE == 'threads': | 29 | if self.TYPE == 'threads': |
30 | self.skipTest('test not appropriate for {}'.format(self.TYPE)) | 30 | self.skipTest('test not appropriate for {}'.format(self.TYPE)) |
31 | @@ -4817,6 +4818,7 @@ class TestWait(unittest.TestCase): | 31 | @@ -4890,6 +4891,7 @@ class TestWait(unittest.TestCase): |
32 | sem.release() | 32 | sem.release() |
33 | time.sleep(period) | 33 | time.sleep(period) |
34 | 34 | ||
@@ -37,13 +37,13 @@ index 3bc5b8f..a6e106d 100644 | |||
37 | from multiprocessing.connection import wait | 37 | from multiprocessing.connection import wait |
38 | 38 | ||
39 | diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py | 39 | diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py |
40 | index 875615a..aebaa8c 100644 | 40 | index 884b142..542e980 100644 |
41 | --- a/Lib/test/test_time.py | 41 | --- a/Lib/test/test_time.py |
42 | +++ b/Lib/test/test_time.py | 42 | +++ b/Lib/test/test_time.py |
43 | @@ -474,6 +474,7 @@ class TimeTestCase(unittest.TestCase): | 43 | @@ -492,6 +492,7 @@ class TimeTestCase(unittest.TestCase): |
44 | def test_perf_counter(self): | 44 | @unittest.skipIf( |
45 | time.perf_counter() | 45 | support.is_wasi, "process_time not available on WASI" |
46 | 46 | ) | |
47 | + @unittest.skip('timing related test, dependent on load') | 47 | + @unittest.skip('timing related test, dependent on load') |
48 | def test_process_time(self): | 48 | def test_process_time(self): |
49 | # process_time() should not include time spend during a sleep | 49 | # process_time() should not include time spend during a sleep |
diff --git a/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch b/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch deleted file mode 100644 index 993ac243fc..0000000000 --- a/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From d7217b79a4e125d4fcc1087743171b94d91d1121 Mon Sep 17 00:00:00 2001 | ||
2 | From: Inada Naoki <songofacandy@gmail.com> | ||
3 | Date: Sat, 14 Jul 2018 00:46:11 +0900 | ||
4 | Subject: [PATCH] Use FLAG_REF always for interned strings | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/8226] | ||
7 | Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> | ||
8 | |||
9 | --- | ||
10 | Python/marshal.c | 9 +++++++-- | ||
11 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/Python/marshal.c b/Python/marshal.c | ||
14 | index 4125240..341c9aa 100644 | ||
15 | --- a/Python/marshal.c | ||
16 | +++ b/Python/marshal.c | ||
17 | @@ -298,9 +298,14 @@ w_ref(PyObject *v, char *flag, WFILE *p) | ||
18 | if (p->version < 3 || p->hashtable == NULL) | ||
19 | return 0; /* not writing object references */ | ||
20 | |||
21 | - /* if it has only one reference, it definitely isn't shared */ | ||
22 | - if (Py_REFCNT(v) == 1) | ||
23 | + /* If it has only one reference, it definitely isn't shared. | ||
24 | + * But we use TYPE_REF always for interned string, to PYC file stable | ||
25 | + * as possible. | ||
26 | + */ | ||
27 | + if (Py_REFCNT(v) == 1 && | ||
28 | + !(PyUnicode_CheckExact(v) && PyUnicode_CHECK_INTERNED(v))) { | ||
29 | return 0; | ||
30 | + } | ||
31 | |||
32 | entry = _Py_hashtable_get_entry(p->hashtable, v); | ||
33 | if (entry != NULL) { | ||
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 6ab335a405..f303eb35dc 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,4 +1,4 @@ | |||
1 | From bb409432f03dd8256865292e382ad16613737829 Mon Sep 17 00:00:00 2001 | 1 | From d2abe7328cea770425405aa0da2f4c2dac89fcad 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 |
@@ -15,19 +15,19 @@ Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196] | |||
15 | Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io> | 15 | Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io> |
16 | 16 | ||
17 | --- | 17 | --- |
18 | configure.ac | 175 +++++++-------------------------------------------- | 18 | configure.ac | 196 ++++++--------------------------------------------- |
19 | 1 file changed, 21 insertions(+), 154 deletions(-) | 19 | 1 file changed, 21 insertions(+), 175 deletions(-) |
20 | 20 | ||
21 | diff --git a/configure.ac b/configure.ac | 21 | diff --git a/configure.ac b/configure.ac |
22 | index 4230ef2..ee08b1b 100644 | 22 | index 358b6ea..085fc0b 100644 |
23 | --- a/configure.ac | 23 | --- a/configure.ac |
24 | +++ b/configure.ac | 24 | +++ b/configure.ac |
25 | @@ -718,160 +718,27 @@ then | 25 | @@ -907,181 +907,27 @@ then |
26 | fi | 26 | fi |
27 | 27 | ||
28 | 28 | ||
29 | -AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) | 29 | -AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) |
30 | -cat >> conftest.c <<EOF | 30 | -cat > conftest.c <<EOF |
31 | -#undef bfin | 31 | -#undef bfin |
32 | -#undef cris | 32 | -#undef cris |
33 | -#undef fr30 | 33 | -#undef fr30 |
@@ -167,6 +167,22 @@ index 4230ef2..ee08b1b 100644 | |||
167 | - darwin | 167 | - darwin |
168 | -#elif defined(__VXWORKS__) | 168 | -#elif defined(__VXWORKS__) |
169 | - vxworks | 169 | - vxworks |
170 | -#elif defined(__wasm32__) | ||
171 | -# if defined(__EMSCRIPTEN__) | ||
172 | - wasm32-emscripten | ||
173 | -# elif defined(__wasi__) | ||
174 | - wasm32-wasi | ||
175 | -# else | ||
176 | -# error unknown wasm32 platform | ||
177 | -# endif | ||
178 | -#elif defined(__wasm64__) | ||
179 | -# if defined(__EMSCRIPTEN) | ||
180 | - wasm64-emscripten | ||
181 | -# elif defined(__wasi__) | ||
182 | - wasm64-wasi | ||
183 | -# else | ||
184 | -# error unknown wasm64 platform | ||
185 | -# endif | ||
170 | -#else | 186 | -#else |
171 | -# error unknown platform triplet | 187 | -# error unknown platform triplet |
172 | -#endif | 188 | -#endif |
@@ -175,6 +191,11 @@ index 4230ef2..ee08b1b 100644 | |||
175 | - | 191 | - |
176 | -if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then | 192 | -if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then |
177 | - PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '` | 193 | - PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '` |
194 | - case "$build_os" in | ||
195 | - linux-musl*) | ||
196 | - PLATFORM_TRIPLET=`echo "$PLATFORM_TRIPLET" | sed 's/linux-gnu/linux-musl/'` | ||
197 | - ;; | ||
198 | - esac | ||
178 | - AC_MSG_RESULT([$PLATFORM_TRIPLET]) | 199 | - AC_MSG_RESULT([$PLATFORM_TRIPLET]) |
179 | -else | 200 | -else |
180 | - AC_MSG_RESULT([none]) | 201 | - AC_MSG_RESULT([none]) |
diff --git a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch index 368a725ff7..45a37ed1a9 100644 --- a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +++ b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c24674e0a52367359a1a3d950bab8bc3d282279b Mon Sep 17 00:00:00 2001 | 1 | From 9c6b9f46179c8f9c9391767e2b02f268a1ee7a9c Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 31 Jan 2019 16:46:30 +0100 | 3 | Date: Thu, 31 Jan 2019 16:46:30 +0100 |
4 | Subject: [PATCH] distutils/sysconfig: append | 4 | Subject: [PATCH] distutils/sysconfig: append |
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 1 file changed, 2 insertions(+) | 14 | 1 file changed, 2 insertions(+) |
15 | 15 | ||
16 | diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py | 16 | diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py |
17 | index 40c6b3e..ac94cc7 100644 | 17 | index ff399e2..95844cf 100644 |
18 | --- a/Lib/sysconfig.py | 18 | --- a/Lib/sysconfig.py |
19 | +++ b/Lib/sysconfig.py | 19 | +++ b/Lib/sysconfig.py |
20 | @@ -474,6 +474,8 @@ def _init_posix(vars): | 20 | @@ -528,6 +528,8 @@ def _init_posix(vars): |
21 | """Initialize the module as appropriate for POSIX systems.""" | 21 | """Initialize the module as appropriate for POSIX systems.""" |
22 | # _sysconfigdata is generated at build time, see _generate_posix_vars() | 22 | # _sysconfigdata is generated at build time, see _generate_posix_vars() |
23 | name = _get_sysconfigdata_name() | 23 | name = _get_sysconfigdata_name() |
diff --git a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch index 2c7d264da0..4d589dd759 100644 --- a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch +++ b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9f68a27eb34394a00f1011c06900c609f15fb15c Mon Sep 17 00:00:00 2001 | 1 | From 175ed10e0a59a5395546ef88702f23d100b909f9 Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Mon, 22 Oct 2018 15:19:51 +0800 | 3 | Date: Mon, 22 Oct 2018 15:19:51 +0800 |
4 | Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler | 4 | Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler |
@@ -27,18 +27,18 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
27 | 1 file changed, 10 insertions(+), 9 deletions(-) | 27 | 1 file changed, 10 insertions(+), 9 deletions(-) |
28 | 28 | ||
29 | diff --git a/configure.ac b/configure.ac | 29 | diff --git a/configure.ac b/configure.ac |
30 | index 0c06914..299786b 100644 | 30 | index 77fb609..358b6ea 100644 |
31 | --- a/configure.ac | 31 | --- a/configure.ac |
32 | +++ b/configure.ac | 32 | +++ b/configure.ac |
33 | @@ -61,6 +61,7 @@ AC_CONFIG_HEADER(pyconfig.h) | 33 | @@ -134,6 +134,7 @@ AC_CONFIG_HEADERS([pyconfig.h]) |
34 | AC_CANONICAL_HOST | 34 | AC_CANONICAL_HOST |
35 | AC_SUBST(build) | 35 | AC_SUBST(build) |
36 | AC_SUBST(host) | 36 | AC_SUBST(host) |
37 | +LT_INIT | 37 | +LT_INIT |
38 | 38 | ||
39 | # pybuilddir.txt will be created by --generate-posix-vars in the Makefile | 39 | AS_VAR_IF([cross_compiling], [maybe], |
40 | rm -f pybuilddir.txt | 40 | [AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])] |
41 | @@ -688,7 +689,7 @@ AC_MSG_RESULT($with_cxx_main) | 41 | @@ -877,7 +878,7 @@ AC_MSG_RESULT($with_cxx_main) |
42 | preset_cxx="$CXX" | 42 | preset_cxx="$CXX" |
43 | if test -z "$CXX" | 43 | if test -z "$CXX" |
44 | then | 44 | then |
@@ -47,7 +47,7 @@ index 0c06914..299786b 100644 | |||
47 | gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; | 47 | gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; |
48 | cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; | 48 | cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; |
49 | clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;; | 49 | clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;; |
50 | @@ -976,7 +977,7 @@ rmdir CaseSensitiveTestDir | 50 | @@ -1290,7 +1291,7 @@ rmdir CaseSensitiveTestDir |
51 | 51 | ||
52 | case $ac_sys_system in | 52 | case $ac_sys_system in |
53 | hp*|HP*) | 53 | hp*|HP*) |
@@ -56,16 +56,16 @@ index 0c06914..299786b 100644 | |||
56 | cc|*/cc) CC="$CC -Ae";; | 56 | cc|*/cc) CC="$CC -Ae";; |
57 | esac;; | 57 | esac;; |
58 | esac | 58 | esac |
59 | @@ -1374,7 +1375,7 @@ else | 59 | @@ -1798,7 +1799,7 @@ esac |
60 | fi], | 60 | ], |
61 | [AC_MSG_RESULT(no)]) | 61 | [AC_MSG_RESULT(no)]) |
62 | if test "$Py_LTO" = 'true' ; then | 62 | if test "$Py_LTO" = 'true' ; then |
63 | - case $CC in | 63 | - case $CC in |
64 | + case $cc_basename in | 64 | + case $cc_basename in |
65 | *clang*) | 65 | *clang*) |
66 | AC_SUBST(LLVM_AR) | 66 | dnl flag to disable lto during linking |
67 | AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path}) | 67 | LDFLAGS_NOLTO="-fno-lto" |
68 | @@ -1467,7 +1468,7 @@ then | 68 | @@ -1917,7 +1918,7 @@ then |
69 | fi | 69 | fi |
70 | fi | 70 | fi |
71 | LLVM_PROF_ERR=no | 71 | LLVM_PROF_ERR=no |
@@ -74,7 +74,7 @@ index 0c06914..299786b 100644 | |||
74 | *clang*) | 74 | *clang*) |
75 | # Any changes made here should be reflected in the GCC+Darwin case below | 75 | # Any changes made here should be reflected in the GCC+Darwin case below |
76 | PGO_PROF_GEN_FLAG="-fprofile-instr-generate" | 76 | PGO_PROF_GEN_FLAG="-fprofile-instr-generate" |
77 | @@ -1528,7 +1529,7 @@ esac | 77 | @@ -1978,7 +1979,7 @@ esac |
78 | # compiler and platform. BASECFLAGS tweaks need to be made even if the | 78 | # compiler and platform. BASECFLAGS tweaks need to be made even if the |
79 | # user set OPT. | 79 | # user set OPT. |
80 | 80 | ||
@@ -83,16 +83,16 @@ index 0c06914..299786b 100644 | |||
83 | *clang*) | 83 | *clang*) |
84 | cc_is_clang=1 | 84 | cc_is_clang=1 |
85 | ;; | 85 | ;; |
86 | @@ -1664,7 +1665,7 @@ yes) | 86 | @@ -2197,7 +2198,7 @@ yes) |
87 | 87 | ||
88 | # ICC doesn't recognize the option, but only emits a warning | 88 | # ICC doesn't recognize the option, but only emits a warning |
89 | ## XXX does it emit an unused result warning and can it be disabled? | 89 | ## XXX does it emit an unused result warning and can it be disabled? |
90 | - case "$CC" in | 90 | - AS_CASE([$CC], |
91 | + case "$cc_basename" in | 91 | + AS_CASE([$cc_basename], |
92 | *icc*) | 92 | [*icc*], [ac_cv_disable_unused_result_warning=no] |
93 | ac_cv_disable_unused_result_warning=no | 93 | [PY_CHECK_CC_WARNING([disable], [unused-result])]) |
94 | ;; | 94 | AS_VAR_IF([ac_cv_disable_unused_result_warning], [yes], |
95 | @@ -2018,7 +2019,7 @@ yes) | 95 | @@ -2439,7 +2440,7 @@ yes) |
96 | ;; | 96 | ;; |
97 | esac | 97 | esac |
98 | 98 | ||
@@ -101,7 +101,7 @@ index 0c06914..299786b 100644 | |||
101 | *icc*) | 101 | *icc*) |
102 | # ICC needs -fp-model strict or floats behave badly | 102 | # ICC needs -fp-model strict or floats behave badly |
103 | CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict" | 103 | CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict" |
104 | @@ -2836,7 +2837,7 @@ then | 104 | @@ -3281,7 +3282,7 @@ then |
105 | then | 105 | then |
106 | LINKFORSHARED="-Wl,--export-dynamic" | 106 | LINKFORSHARED="-Wl,--export-dynamic" |
107 | fi;; | 107 | fi;; |
@@ -110,7 +110,7 @@ index 0c06914..299786b 100644 | |||
110 | *gcc*) | 110 | *gcc*) |
111 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null | 111 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null |
112 | then | 112 | then |
113 | @@ -5622,7 +5623,7 @@ if test "$have_gcc_asm_for_x87" = yes; then | 113 | @@ -6370,7 +6371,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then |
114 | # Some versions of gcc miscompile inline asm: | 114 | # Some versions of gcc miscompile inline asm: |
115 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 | 115 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 |
116 | # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html | 116 | # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html |
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index a06e9b56c1..7b497b83ca 100644 --- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1cc4cab8d579bbccb8a4fc13a28158a58c603cb4 Mon Sep 17 00:00:00 2001 | 1 | From 2918d431cb5607933755fc80a6220135dd7fcb1d Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 14 May 2013 15:00:26 -0700 | 3 | Date: Tue, 14 May 2013 15:00:26 -0700 |
4 | Subject: [PATCH] python3: Add target and native recipes | 4 | Subject: [PATCH] python3: Add target and native recipes |
@@ -18,10 +18,10 @@ Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | |||
18 | 1 file changed, 11 insertions(+), 3 deletions(-) | 18 | 1 file changed, 11 insertions(+), 3 deletions(-) |
19 | 19 | ||
20 | diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py | 20 | diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py |
21 | index 3414a76..361d3a1 100644 | 21 | index 03b8558..57d193d 100644 |
22 | --- a/Lib/distutils/sysconfig.py | 22 | --- a/Lib/distutils/sysconfig.py |
23 | +++ b/Lib/distutils/sysconfig.py | 23 | +++ b/Lib/distutils/sysconfig.py |
24 | @@ -277,7 +277,9 @@ def get_python_inc(plat_specific=0, prefix=None): | 24 | @@ -272,7 +272,9 @@ def get_python_inc(plat_specific=0, prefix=None): |
25 | If 'prefix' is supplied, use it instead of sys.base_prefix or | 25 | If 'prefix' is supplied, use it instead of sys.base_prefix or |
26 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. | 26 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. |
27 | """ | 27 | """ |
@@ -32,7 +32,7 @@ index 3414a76..361d3a1 100644 | |||
32 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX | 32 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX |
33 | if os.name == "posix": | 33 | if os.name == "posix": |
34 | if python_build: | 34 | if python_build: |
35 | @@ -320,7 +322,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): | 35 | @@ -315,7 +317,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): |
36 | If 'prefix' is supplied, use it instead of sys.base_prefix or | 36 | If 'prefix' is supplied, use it instead of sys.base_prefix or |
37 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. | 37 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. |
38 | """ | 38 | """ |
@@ -47,7 +47,7 @@ index 3414a76..361d3a1 100644 | |||
47 | if standard_lib: | 47 | if standard_lib: |
48 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX | 48 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX |
49 | else: | 49 | else: |
50 | @@ -334,7 +342,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): | 50 | @@ -329,7 +337,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): |
51 | else: | 51 | else: |
52 | # Pure Python | 52 | # Pure Python |
53 | libdir = "lib" | 53 | libdir = "lib" |
diff --git a/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch b/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch index 2de72b7199..5a6cfc9572 100644 --- a/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch +++ b/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6a23d52c905cd1f6a5944255903ec86ea8b904bb Mon Sep 17 00:00:00 2001 | 1 | From 627b8fe6b3c11e8bb1bb1ad1d6b816b79b8dd2ce Mon Sep 17 00:00:00 2001 |
2 | From: Andrei Gherzan <andrei@gherzan.ro> | 2 | From: Andrei Gherzan <andrei@gherzan.ro> |
3 | Date: Mon, 28 Jan 2019 15:57:54 +0000 | 3 | Date: Mon, 28 Jan 2019 15:57:54 +0000 |
4 | Subject: [PATCH] _tkinter module needs tk module along with tcl. tk is not yet | 4 | Subject: [PATCH] _tkinter module needs tk module along with tcl. tk is not yet |
@@ -9,23 +9,22 @@ Upstream-Status: Inappropriate [distribution] | |||
9 | 9 | ||
10 | Also simply disable the tk module since its not in DEPENDS. | 10 | Also simply disable the tk module since its not in DEPENDS. |
11 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | 11 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> |
12 | |||
13 | --- | 12 | --- |
14 | setup.py | 4 ++-- | 13 | setup.py | 1 - |
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | 14 | 1 file changed, 1 deletion(-) |
16 | 15 | ||
17 | diff --git a/setup.py b/setup.py | 16 | diff --git a/setup.py b/setup.py |
18 | index 11b5cf5..2be4738 100644 | 17 | index 7555dcd..f29ac86 100644 |
19 | --- a/setup.py | 18 | --- a/setup.py |
20 | +++ b/setup.py | 19 | +++ b/setup.py |
21 | @@ -1895,8 +1895,8 @@ class PyBuildExt(build_ext): | 20 | @@ -1364,7 +1364,6 @@ class PyBuildExt(build_ext): |
22 | self.detect_decimal() | 21 | self.detect_decimal() |
23 | self.detect_ctypes() | 22 | self.detect_ctypes() |
24 | self.detect_multiprocessing() | 23 | self.detect_multiprocessing() |
25 | - if not self.detect_tkinter(): | 24 | - self.detect_tkinter() |
26 | - self.missing.append('_tkinter') | ||
27 | +# if not self.detect_tkinter(): | ||
28 | +# self.missing.append('_tkinter') | ||
29 | self.detect_uuid() | 25 | self.detect_uuid() |
30 | 26 | ||
31 | ## # Uncomment these lines if you want to play with xxmodule.c | 27 | # Uncomment the next line if you want to play with xxmodule.c |
28 | -- | ||
29 | 2.30.2 | ||
30 | |||
diff --git a/meta/recipes-devtools/python/python3/crosspythonpath.patch b/meta/recipes-devtools/python/python3/crosspythonpath.patch index 5bb25264da..2fbb17f118 100644 --- a/meta/recipes-devtools/python/python3/crosspythonpath.patch +++ b/meta/recipes-devtools/python/python3/crosspythonpath.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From baa3a232e64e9bf5ae945366efdb8088ccf9b828 Mon Sep 17 00:00:00 2001 | 1 | From 7d5fc6a86103d9bd4a274e9fd31b6987e39998a1 Mon Sep 17 00:00:00 2001 |
2 | From: Ricardo Ribalda <ricardo@ribalda.com> | 2 | From: Ricardo Ribalda <ricardo@ribalda.com> |
3 | Date: Tue, 18 Nov 2014 03:35:33 -0500 | 3 | Date: Tue, 18 Nov 2014 03:35:33 -0500 |
4 | Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for | 4 | Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for |
@@ -20,15 +20,15 @@ Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> | |||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
21 | 21 | ||
22 | diff --git a/configure.ac b/configure.ac | 22 | diff --git a/configure.ac b/configure.ac |
23 | index d0db062..e5e3df8 100644 | 23 | index 085fc0b..22790d7 100644 |
24 | --- a/configure.ac | 24 | --- a/configure.ac |
25 | +++ b/configure.ac | 25 | +++ b/configure.ac |
26 | @@ -83,7 +83,7 @@ if test "$cross_compiling" = yes; then | 26 | @@ -163,7 +163,7 @@ AC_ARG_WITH( |
27 | AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) | 27 | dnl Build Python interpreter is used for regeneration and freezing. |
28 | fi | 28 | ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python |
29 | AC_MSG_RESULT($interp) | 29 | PYTHON_FOR_FREEZE="$with_build_python" |
30 | - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp | 30 | - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python |
31 | + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp | 31 | + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python |
32 | fi | 32 | AC_MSG_RESULT([$with_build_python]) |
33 | elif test "$cross_compiling" = maybe; then | 33 | ], [ |
34 | AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) | 34 | AS_VAR_IF([cross_compiling], [yes], |
diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch index 2c06784ffc..979fc9dc36 100644 --- a/meta/recipes-devtools/python/python3/makerace.patch +++ b/meta/recipes-devtools/python/python3/makerace.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7cc02dfa593d1350a689d64a7a6f2dc6478afe24 Mon Sep 17 00:00:00 2001 | 1 | From 4f52aaf2a548b3356c6f1369c62b11335dc27464 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Tue, 13 Jul 2021 23:19:29 +0100 | 3 | Date: Tue, 13 Jul 2021 23:19:29 +0100 |
4 | Subject: [PATCH] python3: Fix make race | 4 | Subject: [PATCH] python3: Fix make race |
@@ -18,15 +18,15 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/Makefile.pre.in b/Makefile.pre.in | 20 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
21 | index 5e13ba2..026bffd 100644 | 21 | index 7558f0c..8cec819 100644 |
22 | --- a/Makefile.pre.in | 22 | --- a/Makefile.pre.in |
23 | +++ b/Makefile.pre.in | 23 | +++ b/Makefile.pre.in |
24 | @@ -1527,7 +1527,7 @@ TESTSUBDIRS= ctypes/test \ | 24 | @@ -2005,7 +2005,7 @@ TESTSUBDIRS= ctypes/test \ |
25 | unittest/test unittest/test/testmock | 25 | unittest/test unittest/test/testmock |
26 | 26 | ||
27 | TEST_MODULES=@TEST_MODULES@ | 27 | TEST_MODULES=@TEST_MODULES@ |
28 | -libinstall: build_all $(srcdir)/Modules/xxmodule.c | 28 | -libinstall: all $(srcdir)/Modules/xxmodule.c |
29 | +libinstall: build_all $(srcdir)/Modules/xxmodule.c libainstall | 29 | +libinstall: all $(srcdir)/Modules/xxmodule.c libainstall |
30 | @for i in $(SCRIPTDIR) $(LIBDEST); \ | 30 | @for i in $(SCRIPTDIR) $(LIBDEST); \ |
31 | do \ | 31 | do \ |
32 | if test ! -d $(DESTDIR)$$i; then \ | 32 | if test ! -d $(DESTDIR)$$i; then \ |
diff --git a/meta/recipes-devtools/python/python3_3.10.6.bb b/meta/recipes-devtools/python/python3_3.11.0.bb index 1f8b60a7a5..6b6c983abf 100644 --- a/meta/recipes-devtools/python/python3_3.10.6.bb +++ b/meta/recipes-devtools/python/python3_3.11.0.bb | |||
@@ -22,7 +22,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | |||
22 | file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \ | 22 | file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \ |
23 | file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \ | 23 | file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \ |
24 | file://crosspythonpath.patch \ | 24 | file://crosspythonpath.patch \ |
25 | file://0001-Use-FLAG_REF-always-for-interned-strings.patch \ | ||
26 | file://0001-test_locale.py-correct-the-test-output-format.patch \ | 25 | file://0001-test_locale.py-correct-the-test-output-format.patch \ |
27 | file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ | 26 | file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ |
28 | file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ | 27 | file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ |
@@ -35,7 +34,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | |||
35 | file://0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch \ | 34 | file://0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch \ |
36 | file://deterministic_imports.patch \ | 35 | file://deterministic_imports.patch \ |
37 | file://0001-Avoid-shebang-overflow-on-python-config.py.patch \ | 36 | file://0001-Avoid-shebang-overflow-on-python-config.py.patch \ |
38 | file://0001-Mitigate-the-race-condition-in-testSockName.patch \ | ||
39 | " | 37 | " |
40 | 38 | ||
41 | SRC_URI:append:class-native = " \ | 39 | SRC_URI:append:class-native = " \ |
@@ -44,7 +42,7 @@ SRC_URI:append:class-native = " \ | |||
44 | file://12-distutils-prefix-is-inside-staging-area.patch \ | 42 | file://12-distutils-prefix-is-inside-staging-area.patch \ |
45 | file://0001-Don-t-search-system-for-headers-libraries.patch \ | 43 | file://0001-Don-t-search-system-for-headers-libraries.patch \ |
46 | " | 44 | " |
47 | SRC_URI[sha256sum] = "f795ff87d11d4b0c7c33bc8851b0c28648d8a4583aa2100a98c22b4326b6d3f3" | 45 | SRC_URI[sha256sum] = "a57dc82d77358617ba65b9841cee1e3b441f386c3789ddc0676eca077f2951c3" |
48 | 46 | ||
49 | # exclude pre-releases for both python 2.x and 3.x | 47 | # exclude pre-releases for both python 2.x and 3.x |
50 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" | 48 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" |
@@ -62,7 +60,7 @@ CVE_CHECK_IGNORE += "CVE-2020-15523 CVE-2022-26488" | |||
62 | # The module will be removed in the future and flaws documented. | 60 | # The module will be removed in the future and flaws documented. |
63 | CVE_CHECK_IGNORE += "CVE-2015-20107" | 61 | CVE_CHECK_IGNORE += "CVE-2015-20107" |
64 | 62 | ||
65 | PYTHON_MAJMIN = "3.10" | 63 | PYTHON_MAJMIN = "3.11" |
66 | 64 | ||
67 | S = "${WORKDIR}/Python-${PV}" | 65 | S = "${WORKDIR}/Python-${PV}" |
68 | 66 | ||
@@ -81,11 +79,10 @@ DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/li | |||
81 | DEPENDS:append:class-target = " python3-native" | 79 | DEPENDS:append:class-target = " python3-native" |
82 | DEPENDS:append:class-nativesdk = " python3-native" | 80 | DEPENDS:append:class-nativesdk = " python3-native" |
83 | 81 | ||
84 | # force to use the mutex+cond implementation (https://bugs.python.org/issue41710) | ||
85 | CFLAGS += "-DHAVE_BROKEN_POSIX_SEMAPHORES" | ||
86 | |||
87 | EXTRA_OECONF = " --without-ensurepip --enable-shared --with-platlibdir=${baselib}" | 82 | EXTRA_OECONF = " --without-ensurepip --enable-shared --with-platlibdir=${baselib}" |
88 | EXTRA_OECONF:append:class-native = " --bindir=${bindir}/${PN}" | 83 | EXTRA_OECONF:append:class-native = " --bindir=${bindir}/${PN}" |
84 | EXTRA_OECONF:append:class-target = " --with-build-python=nativepython3" | ||
85 | EXTRA_OECONF:append:class-nativesdk = " --with-build-python=nativepython3" | ||
89 | 86 | ||
90 | export CROSSPYTHONPATH="${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/" | 87 | export CROSSPYTHONPATH="${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/" |
91 | 88 | ||