summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3-maturin/0002-Fix-cross-compilation-issue-with-linux-armv7l-archit.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2024-12-04 07:49:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-05 17:07:10 +0000
commit75d5ff281a5cac6c2f61b21a3a4703a7779d8065 (patch)
tree984fb08deec2c72ca36d13687d72ec05d61653ab /meta/recipes-devtools/python/python3-maturin/0002-Fix-cross-compilation-issue-with-linux-armv7l-archit.patch
parent91051f1a345eb6e9035a62e21dff9c93ce9e58a3 (diff)
downloadpoky-75d5ff281a5cac6c2f61b21a3a4703a7779d8065.tar.gz
python3-maturin: update 1.7.1 -> 1.7.4
(From OE-Core rev: d3e61ba2a73894e72b6a85f96df92fc33e97b0bb) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3-maturin/0002-Fix-cross-compilation-issue-with-linux-armv7l-archit.patch')
-rw-r--r--meta/recipes-devtools/python/python3-maturin/0002-Fix-cross-compilation-issue-with-linux-armv7l-archit.patch76
1 files changed, 0 insertions, 76 deletions
diff --git a/meta/recipes-devtools/python/python3-maturin/0002-Fix-cross-compilation-issue-with-linux-armv7l-archit.patch b/meta/recipes-devtools/python/python3-maturin/0002-Fix-cross-compilation-issue-with-linux-armv7l-archit.patch
deleted file mode 100644
index 4366dde111..0000000000
--- a/meta/recipes-devtools/python/python3-maturin/0002-Fix-cross-compilation-issue-with-linux-armv7l-archit.patch
+++ /dev/null
@@ -1,76 +0,0 @@
1From 0c6b8cc84eff72ed21098029aaba079b899dbee2 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?=
3 <vesa.jaaskelainen@vaisala.com>
4Date: Sun, 1 Sep 2024 09:23:40 +0300
5Subject: [PATCH 2/5] Fix cross compilation issue with linux-armv7l
6 architecture
7MIME-Version: 1.0
8Content-Type: text/plain; charset=UTF-8
9Content-Transfer-Encoding: 8bit
10
11When compiling under Yocto project for linux-armv7l target architecture
12.so files were generated incorrectly as:
13
14 rpds.cpython-312-armv7l-linux-gnueabihf.so
15
16Where as platform and EXT_SUFFIX are defined as:
17
18 >>> sysconfig.get_platform()
19 'linux-armv7l'
20 >>> sysconfig.get_config_vars()['EXT_SUFFIX']
21 '.cpython-312-arm-linux-gnueabihf.so'
22
23Which should have caused the .so files as:
24
25 rpds.cpython-312-arm-linux-gnueabihf.so
26
27Upstream-Status: Backport [https://github.com/PyO3/maturin/commit/0c6b8cc84eff72ed21098029aaba079b899dbee2]
28
29Signed-off-by: Vesa Jääskeläinen <vesa.jaaskelainen@vaisala.com>
30---
31 src/python_interpreter/config.rs | 8 ++++----
32 1 file changed, 4 insertions(+), 4 deletions(-)
33
34diff --git a/src/python_interpreter/config.rs b/src/python_interpreter/config.rs
35index d76606f2..5736aedc 100644
36--- a/src/python_interpreter/config.rs
37+++ b/src/python_interpreter/config.rs
38@@ -306,7 +306,7 @@ impl InterpreterConfig {
39 format!(
40 ".cpython-{}-{}-{}-{}.{}",
41 abi_tag,
42- target.get_python_arch(),
43+ target.get_python_ext_arch(interpreter_kind),
44 target.get_python_os(),
45 target_env,
46 file_ext,
47@@ -319,7 +319,7 @@ impl InterpreterConfig {
48 major,
49 minor,
50 abi_tag,
51- target.get_python_arch(),
52+ target.get_python_ext_arch(interpreter_kind),
53 target.get_python_os(),
54 target_env,
55 file_ext,
56@@ -330,7 +330,7 @@ impl InterpreterConfig {
57 format!(
58 ".{}-{}-{}.{}",
59 abi_tag.replace('_', "-"),
60- target.get_python_arch(),
61+ target.get_python_ext_arch(interpreter_kind),
62 target.get_python_os(),
63 file_ext,
64 )
65@@ -341,7 +341,7 @@ impl InterpreterConfig {
66 format!(
67 ".cpython-{}-{}-{}.{}",
68 abi_tag,
69- target.get_python_arch(),
70+ target.get_python_ext_arch(interpreter_kind),
71 target.get_python_os(),
72 file_ext
73 )
74--
752.34.1
76