diff options
| author | Tim Orling <tim.orling@konsulko.com> | 2025-06-24 21:24:39 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-26 11:02:34 +0100 |
| commit | d8550091fb309f304e6eb1feeb701986236f5d5e (patch) | |
| tree | f760e9c85b2388e14330a8a8cfadc06506359854 /meta/recipes-devtools/python/python3-maturin | |
| parent | a2d6695088861fe458fbf3eea3a77b52784dc2d2 (diff) | |
| download | poky-d8550091fb309f304e6eb1feeb701986236f5d5e.tar.gz | |
python3-maturin: upgrade 1.8.6 -> 1.8.7
* Drop riscv32 patch as it has been fixed upstream
https://github.com/PyO3/maturin/commit/90b30a4e94e58e8d77d5d663cd2e0bbaab933f33
* Update crates
https://www.maturin.rs/changelog.html
1.8.7
Allow specifying compression method and level, in both build and develop modes, in #2625.
Fix Windows free-threaded builds on Python 3.14 in #2632
Comparing changes from v1.8.6 to v1.8.7:
https://github.com/PyO3/maturin/compare/v1.8.6...v1.8.7
(From OE-Core rev: 61d2e2f67c387f976a3c6a165243c74bca66b3f4)
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3-maturin')
| -rw-r--r-- | meta/recipes-devtools/python/python3-maturin/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch | 110 |
1 files changed, 0 insertions, 110 deletions
diff --git a/meta/recipes-devtools/python/python3-maturin/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch b/meta/recipes-devtools/python/python3-maturin/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch deleted file mode 100644 index aceefa7967..0000000000 --- a/meta/recipes-devtools/python/python3-maturin/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch +++ /dev/null | |||
| @@ -1,110 +0,0 @@ | |||
| 1 | From 4b439b0953573e0383da7e092b1f516ba21f3398 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Dan Gohman <dev@sunfishcode.online> | ||
| 3 | Date: Sun, 6 Apr 2025 05:22:49 -0700 | ||
| 4 | Subject: [PATCH] Define Linux ioctl codes on more architectures. | ||
| 5 | |||
| 6 | Define ioctl codes including `FICLONE` and `FS_IOC32_GETVERSION` using | ||
| 7 | `_IOR` and `_IOW` so that they're automatically supported on all | ||
| 8 | architectures, including riscv32gc-unknown-linux-gnu. | ||
| 9 | |||
| 10 | Upstream-Status: Backport [https://github.com/rust-lang/libc/pull/4382/] | ||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | src/unix/linux_like/linux/arch/generic/mod.rs | 75 ++++--------------- | ||
| 14 | 1 file changed, 15 insertions(+), 60 deletions(-) | ||
| 15 | |||
| 16 | --- a/src/unix/linux_like/linux/arch/generic/mod.rs | ||
| 17 | +++ b/src/unix/linux_like/linux/arch/generic/mod.rs | ||
| 18 | @@ -1,5 +1,5 @@ | ||
| 19 | use crate::prelude::*; | ||
| 20 | -use crate::Ioctl; | ||
| 21 | +use crate::{Ioctl, _IOR, _IOW}; | ||
| 22 | |||
| 23 | s! { | ||
| 24 | pub struct termios2 { | ||
| 25 | @@ -116,21 +116,8 @@ cfg_if! { | ||
| 26 | // pub const SO_PREFER_BUSY_POLL: c_int = 69; | ||
| 27 | // pub const SO_BUSY_POLL_BUDGET: c_int = 70; | ||
| 28 | |||
| 29 | -cfg_if! { | ||
| 30 | - if #[cfg(any( | ||
| 31 | - target_arch = "x86", | ||
| 32 | - target_arch = "x86_64", | ||
| 33 | - target_arch = "arm", | ||
| 34 | - target_arch = "aarch64", | ||
| 35 | - target_arch = "riscv64", | ||
| 36 | - target_arch = "s390x", | ||
| 37 | - target_arch = "csky", | ||
| 38 | - target_arch = "loongarch64" | ||
| 39 | - ))] { | ||
| 40 | - pub const FICLONE: c_ulong = 0x40049409; | ||
| 41 | - pub const FICLONERANGE: c_ulong = 0x4020940D; | ||
| 42 | - } | ||
| 43 | -} | ||
| 44 | +pub const FICLONE: Ioctl = _IOW::<c_int>(0x94, 9) as Ioctl; | ||
| 45 | +pub const FICLONERANGE: Ioctl = _IOW::<crate::file_clone_range>(0x94, 13) as Ioctl; | ||
| 46 | |||
| 47 | // Defined in unix/linux_like/mod.rs | ||
| 48 | // pub const SCM_TIMESTAMP: c_int = SO_TIMESTAMP; | ||
| 49 | @@ -248,49 +235,18 @@ pub const TUNGETVNETBE: Ioctl = 0x800454 | ||
| 50 | pub const TUNSETSTEERINGEBPF: Ioctl = 0x800454e0; | ||
| 51 | pub const TUNSETFILTEREBPF: Ioctl = 0x800454e1; | ||
| 52 | |||
| 53 | -cfg_if! { | ||
| 54 | - // Those type are constructed using the _IOC macro | ||
| 55 | - // DD-SS_SSSS_SSSS_SSSS-TTTT_TTTT-NNNN_NNNN | ||
| 56 | - // where D stands for direction (either None (00), Read (01) or Write (11)) | ||
| 57 | - // where S stands for size (int, long, struct...) | ||
| 58 | - // where T stands for type ('f','v','X'...) | ||
| 59 | - // where N stands for NR (NumbeR) | ||
| 60 | - if #[cfg(any( | ||
| 61 | - target_arch = "x86", | ||
| 62 | - target_arch = "arm", | ||
| 63 | - target_arch = "csky" | ||
| 64 | - ))] { | ||
| 65 | - pub const FS_IOC_GETFLAGS: Ioctl = 0x80046601; | ||
| 66 | - pub const FS_IOC_SETFLAGS: Ioctl = 0x40046602; | ||
| 67 | - pub const FS_IOC_GETVERSION: Ioctl = 0x80047601; | ||
| 68 | - pub const FS_IOC_SETVERSION: Ioctl = 0x40047602; | ||
| 69 | - pub const FS_IOC32_GETFLAGS: Ioctl = 0x80046601; | ||
| 70 | - pub const FS_IOC32_SETFLAGS: Ioctl = 0x40046602; | ||
| 71 | - pub const FS_IOC32_GETVERSION: Ioctl = 0x80047601; | ||
| 72 | - pub const FS_IOC32_SETVERSION: Ioctl = 0x40047602; | ||
| 73 | - pub const TUNATTACHFILTER: Ioctl = 0x400854d5; | ||
| 74 | - pub const TUNDETACHFILTER: Ioctl = 0x400854d6; | ||
| 75 | - pub const TUNGETFILTER: Ioctl = 0x800854db; | ||
| 76 | - } else if #[cfg(any( | ||
| 77 | - target_arch = "x86_64", | ||
| 78 | - target_arch = "riscv64", | ||
| 79 | - target_arch = "aarch64", | ||
| 80 | - target_arch = "s390x", | ||
| 81 | - target_arch = "loongarch64" | ||
| 82 | - ))] { | ||
| 83 | - pub const FS_IOC_GETFLAGS: Ioctl = 0x80086601; | ||
| 84 | - pub const FS_IOC_SETFLAGS: Ioctl = 0x40086602; | ||
| 85 | - pub const FS_IOC_GETVERSION: Ioctl = 0x80087601; | ||
| 86 | - pub const FS_IOC_SETVERSION: Ioctl = 0x40087602; | ||
| 87 | - pub const FS_IOC32_GETFLAGS: Ioctl = 0x80046601; | ||
| 88 | - pub const FS_IOC32_SETFLAGS: Ioctl = 0x40046602; | ||
| 89 | - pub const FS_IOC32_GETVERSION: Ioctl = 0x80047601; | ||
| 90 | - pub const FS_IOC32_SETVERSION: Ioctl = 0x40047602; | ||
| 91 | - pub const TUNATTACHFILTER: Ioctl = 0x401054d5; | ||
| 92 | - pub const TUNDETACHFILTER: Ioctl = 0x401054d6; | ||
| 93 | - pub const TUNGETFILTER: Ioctl = 0x801054db; | ||
| 94 | - } | ||
| 95 | -} | ||
| 96 | +pub const FS_IOC_GETFLAGS: Ioctl = _IOR::<c_long>('f' as u32, 1) as Ioctl; | ||
| 97 | +pub const FS_IOC_SETFLAGS: Ioctl = _IOW::<c_long>('f' as u32, 2) as Ioctl; | ||
| 98 | +pub const FS_IOC_GETVERSION: Ioctl = _IOR::<c_long>('v' as u32, 1) as Ioctl; | ||
| 99 | +pub const FS_IOC_SETVERSION: Ioctl = _IOW::<c_long>('v' as u32, 2) as Ioctl; | ||
| 100 | +pub const FS_IOC32_GETFLAGS: Ioctl = _IOR::<c_int>('f' as u32, 1) as Ioctl; | ||
| 101 | +pub const FS_IOC32_SETFLAGS: Ioctl = _IOW::<c_int>('f' as u32, 2) as Ioctl; | ||
| 102 | +pub const FS_IOC32_GETVERSION: Ioctl = _IOR::<c_int>('v' as u32, 1) as Ioctl; | ||
| 103 | +pub const FS_IOC32_SETVERSION: Ioctl = _IOW::<c_int>('v' as u32, 2) as Ioctl; | ||
| 104 | + | ||
| 105 | +pub const TUNATTACHFILTER: Ioctl = _IOW::<crate::sock_fprog>('T' as u32, 213) as Ioctl; | ||
| 106 | +pub const TUNDETACHFILTER: Ioctl = _IOW::<crate::sock_fprog>('T' as u32, 214) as Ioctl; | ||
| 107 | +pub const TUNGETFILTER: Ioctl = _IOR::<crate::sock_fprog>('T' as u32, 219) as Ioctl; | ||
| 108 | |||
| 109 | cfg_if! { | ||
| 110 | if #[cfg(any(target_arch = "arm", target_arch = "s390x"))] { | ||
