summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python/python3-pyruvate
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-04-08 10:03:05 -0700
committerKhem Raj <raj.khem@gmail.com>2023-04-08 10:05:00 -0700
commit95a76614a6c80c954afc3a61b7ac83ed9f943db6 (patch)
tree1f5f687a8980d2b1bfbc0c291153e0e07dce9267 /meta-python/recipes-devtools/python/python3-pyruvate
parent621a2a377991feb6042bd685037dffe3397b4c36 (diff)
downloadmeta-openembedded-95a76614a6c80c954afc3a61b7ac83ed9f943db6.tar.gz
python3-pyruvate: Upgrade to 1.2.1
Add fixes to build with musl and riscv32 Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-pyruvate')
-rw-r--r--meta-python/recipes-devtools/python/python3-pyruvate/0001-check-for-mips-targets-for-stat.st_dev-definitions.patch4
-rw-r--r--meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-O_LARGEFILE-for-riscv32.patch21
-rw-r--r--meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch99
-rw-r--r--meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch92
-rw-r--r--meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch140
-rw-r--r--meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch35
6 files changed, 390 insertions, 1 deletions
diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-check-for-mips-targets-for-stat.st_dev-definitions.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-check-for-mips-targets-for-stat.st_dev-definitions.patch
index f41e6cf116..3f8256b027 100644
--- a/meta-python/recipes-devtools/python/python3-pyruvate/0001-check-for-mips-targets-for-stat.st_dev-definitions.patch
+++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-check-for-mips-targets-for-stat.st_dev-definitions.patch
@@ -19,7 +19,9 @@ currently the build fails on mips archirecture with type mismatches
19 296 | device: stat.st_dev, 19 296 | device: stat.st_dev,
20 | ^^^^^^^^^^^ expected `u64`, found `u32` 20 | ^^^^^^^^^^^ expected `u64`, found `u32`
21 21
22Upstream-Status: Submitted [https://github.com/lucab/libsystemd-rs/pull/103] 22Drop this patch when libsystemd-rs crate bumps to 0.6.0+
23
24Upstream-Status: Backport [https://github.com/lucab/libsystemd-rs/pull/104]
23Signed-off-by: Khem Raj <raj.khem@gmail.com> 25Signed-off-by: Khem Raj <raj.khem@gmail.com>
24--- 26---
25 src/logging.rs | 3 +++ 27 src/logging.rs | 3 +++
diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-O_LARGEFILE-for-riscv32.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-O_LARGEFILE-for-riscv32.patch
new file mode 100644
index 0000000000..621249c483
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-O_LARGEFILE-for-riscv32.patch
@@ -0,0 +1,21 @@
1From fdf98602ad20d06ebf65574541caac68ca421ac4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 8 Apr 2023 09:19:53 -0700
4Subject: [PATCH] musl: Define O_LARGEFILE for riscv32
5
6Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 src/unix/linux_like/linux/musl/b32/riscv32/mod.rs | 1 +
10 1 file changed, 1 insertion(+)
11
12--- a/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs
13+++ b/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs
14@@ -370,6 +370,7 @@ pub const __SIZEOF_PTHREAD_CONDATTR_T: u
15 pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
16 pub const O_DIRECT: ::c_int = 16384;
17 pub const O_DIRECTORY: ::c_int = 65536;
18+pub const O_LARGEFILE: ::c_int = 0o0100000;
19 pub const O_NOFOLLOW: ::c_int = 131072;
20 pub const MAP_HUGETLB: ::c_int = 262144;
21 pub const MAP_LOCKED: ::c_int = 8192;
diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch
new file mode 100644
index 0000000000..e19b50d30d
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch
@@ -0,0 +1,99 @@
1From f2b06fa4ea6ec9a33f8b269f0a1730a26276c5b0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 8 Apr 2023 08:25:46 -0700
4Subject: [PATCH] musl: Define SOCK_NONBLOCK with O_NONBLOCK
5
6Much like glibc, these defines are same on musl [1] [2]
7therefore consolidate the definition in one place
8for SOCK_NONBLOCK
9
10[1] https://github.com/search?q=repo%3Abminor%2Fmusl++%22%23define+SOCK_NONBLOCK%22&type=code
11[2] https://github.com/search?q=repo%3Abminor%2Fmusl++%22%23define+O_NONBLOCK%22&type=code
12
13Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 src/unix/linux_like/linux/musl/b32/arm/mod.rs | 2 --
17 src/unix/linux_like/linux/musl/b32/hexagon.rs | 1 -
18 src/unix/linux_like/linux/musl/b32/mips/mod.rs | 2 --
19 src/unix/linux_like/linux/musl/b32/powerpc.rs | 2 --
20 src/unix/linux_like/linux/musl/b32/x86/mod.rs | 2 --
21 src/unix/linux_like/linux/musl/b64/mod.rs | 2 --
22 src/unix/linux_like/linux/musl/mod.rs | 1 +
23 7 files changed, 1 insertion(+), 11 deletions(-)
24
25--- a/src/unix/linux_like/linux/musl/b32/arm/mod.rs
26+++ b/src/unix/linux_like/linux/musl/b32/arm/mod.rs
27@@ -311,8 +311,6 @@ pub const O_SYNC: ::c_int = 1052672;
28 pub const O_RSYNC: ::c_int = 1052672;
29 pub const O_DSYNC: ::c_int = 4096;
30
31-pub const SOCK_NONBLOCK: ::c_int = 2048;
32-
33 pub const MAP_ANON: ::c_int = 0x0020;
34 pub const MAP_GROWSDOWN: ::c_int = 0x0100;
35 pub const MAP_DENYWRITE: ::c_int = 0x0800;
36--- a/src/unix/linux_like/linux/musl/b32/hexagon.rs
37+++ b/src/unix/linux_like/linux/musl/b32/hexagon.rs
38@@ -295,7 +295,6 @@ pub const SIG_SETMASK: ::c_int = 2; // F
39 pub const SIG_BLOCK: ::c_int = 0x000000;
40 pub const SIG_UNBLOCK: ::c_int = 0x01;
41 pub const SOCK_DGRAM: ::c_int = 2;
42-pub const SOCK_NONBLOCK: ::c_int = 2048;
43 pub const SOCK_SEQPACKET: ::c_int = 5;
44 pub const SOCK_STREAM: ::c_int = 1;
45 pub const SOL_CAIF: ::c_int = 278;
46--- a/src/unix/linux_like/linux/musl/b32/mips/mod.rs
47+++ b/src/unix/linux_like/linux/musl/b32/mips/mod.rs
48@@ -250,8 +250,6 @@ pub const O_SYNC: ::c_int = 0o40020;
49 pub const O_RSYNC: ::c_int = 0o40020;
50 pub const O_DSYNC: ::c_int = 0o020;
51
52-pub const SOCK_NONBLOCK: ::c_int = 0o200;
53-
54 pub const MAP_ANON: ::c_int = 0x800;
55 pub const MAP_GROWSDOWN: ::c_int = 0x1000;
56 pub const MAP_DENYWRITE: ::c_int = 0x2000;
57--- a/src/unix/linux_like/linux/musl/b32/powerpc.rs
58+++ b/src/unix/linux_like/linux/musl/b32/powerpc.rs
59@@ -243,8 +243,6 @@ pub const O_SYNC: ::c_int = 1052672;
60 pub const O_RSYNC: ::c_int = 1052672;
61 pub const O_DSYNC: ::c_int = 4096;
62
63-pub const SOCK_NONBLOCK: ::c_int = 2048;
64-
65 pub const MAP_ANON: ::c_int = 0x0020;
66 pub const MAP_GROWSDOWN: ::c_int = 0x0100;
67 pub const MAP_DENYWRITE: ::c_int = 0x0800;
68--- a/src/unix/linux_like/linux/musl/b32/x86/mod.rs
69+++ b/src/unix/linux_like/linux/musl/b32/x86/mod.rs
70@@ -300,8 +300,6 @@ pub const O_SYNC: ::c_int = 1052672;
71 pub const O_RSYNC: ::c_int = 1052672;
72 pub const O_DSYNC: ::c_int = 4096;
73
74-pub const SOCK_NONBLOCK: ::c_int = 2048;
75-
76 pub const MAP_ANON: ::c_int = 0x0020;
77 pub const MAP_GROWSDOWN: ::c_int = 0x0100;
78 pub const MAP_DENYWRITE: ::c_int = 0x0800;
79--- a/src/unix/linux_like/linux/musl/b64/mod.rs
80+++ b/src/unix/linux_like/linux/musl/b64/mod.rs
81@@ -133,8 +133,6 @@ s! {
82 pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
83 pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
84
85-pub const SOCK_NONBLOCK: ::c_int = 2048;
86-
87 pub const SOCK_SEQPACKET: ::c_int = 5;
88
89 extern "C" {
90--- a/src/unix/linux_like/linux/musl/mod.rs
91+++ b/src/unix/linux_like/linux/musl/mod.rs
92@@ -527,6 +527,7 @@ pub const POSIX_MADV_DONTNEED: ::c_int =
93 pub const MAP_ANONYMOUS: ::c_int = MAP_ANON;
94
95 pub const SOCK_DCCP: ::c_int = 6;
96+pub const SOCK_NONBLOCK: ::c_int = O_NONBLOCK;
97 pub const SOCK_PACKET: ::c_int = 10;
98
99 pub const SOMAXCONN: ::c_int = 128;
diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch
new file mode 100644
index 0000000000..2da3a43154
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch
@@ -0,0 +1,92 @@
1From e00da82cd46221bfb650895c9cea65082da66b4e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 8 Apr 2023 09:25:31 -0700
4Subject: [PATCH] musl: Define SOCK_SEQPACKET in common place
5
6This define is not architecture specific in musl [1]
7
8[1] https://git.musl-libc.org/cgit/musl/tree/include/sys/socket.h#n90
9
10Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 src/unix/linux_like/linux/musl/b32/arm/mod.rs | 1 -
14 src/unix/linux_like/linux/musl/b32/hexagon.rs | 1 -
15 src/unix/linux_like/linux/musl/b32/mips/mod.rs | 1 -
16 src/unix/linux_like/linux/musl/b32/powerpc.rs | 1 -
17 src/unix/linux_like/linux/musl/b32/x86/mod.rs | 1 -
18 src/unix/linux_like/linux/musl/b64/mod.rs | 2 --
19 src/unix/linux_like/linux/musl/mod.rs | 1 +
20 7 files changed, 1 insertion(+), 7 deletions(-)
21
22--- a/src/unix/linux_like/linux/musl/b32/arm/mod.rs
23+++ b/src/unix/linux_like/linux/musl/b32/arm/mod.rs
24@@ -324,7 +324,6 @@ pub const MAP_SYNC: ::c_int = 0x080000;
25
26 pub const SOCK_STREAM: ::c_int = 1;
27 pub const SOCK_DGRAM: ::c_int = 2;
28-pub const SOCK_SEQPACKET: ::c_int = 5;
29
30 pub const EDEADLK: ::c_int = 35;
31 pub const ENAMETOOLONG: ::c_int = 36;
32--- a/src/unix/linux_like/linux/musl/b32/hexagon.rs
33+++ b/src/unix/linux_like/linux/musl/b32/hexagon.rs
34@@ -292,7 +292,6 @@ pub const SIG_SETMASK: ::c_int = 2; // F
35 pub const SIG_BLOCK: ::c_int = 0x000000;
36 pub const SIG_UNBLOCK: ::c_int = 0x01;
37 pub const SOCK_DGRAM: ::c_int = 2;
38-pub const SOCK_SEQPACKET: ::c_int = 5;
39 pub const SOCK_STREAM: ::c_int = 1;
40 pub const SOL_CAIF: ::c_int = 278;
41 pub const SOL_IUCV: ::c_int = 277;
42--- a/src/unix/linux_like/linux/musl/b32/mips/mod.rs
43+++ b/src/unix/linux_like/linux/musl/b32/mips/mod.rs
44@@ -348,7 +348,6 @@ pub const ERFKILL: ::c_int = 167;
45
46 pub const SOCK_STREAM: ::c_int = 2;
47 pub const SOCK_DGRAM: ::c_int = 1;
48-pub const SOCK_SEQPACKET: ::c_int = 5;
49
50 pub const SA_ONSTACK: ::c_int = 0x08000000;
51 pub const SA_SIGINFO: ::c_int = 8;
52--- a/src/unix/linux_like/linux/musl/b32/powerpc.rs
53+++ b/src/unix/linux_like/linux/musl/b32/powerpc.rs
54@@ -255,7 +255,6 @@ pub const MAP_STACK: ::c_int = 0x020000;
55
56 pub const SOCK_STREAM: ::c_int = 1;
57 pub const SOCK_DGRAM: ::c_int = 2;
58-pub const SOCK_SEQPACKET: ::c_int = 5;
59
60 pub const EDEADLK: ::c_int = 35;
61 pub const ENAMETOOLONG: ::c_int = 36;
62--- a/src/unix/linux_like/linux/musl/b32/x86/mod.rs
63+++ b/src/unix/linux_like/linux/musl/b32/x86/mod.rs
64@@ -313,7 +313,6 @@ pub const MAP_SYNC: ::c_int = 0x080000;
65
66 pub const SOCK_STREAM: ::c_int = 1;
67 pub const SOCK_DGRAM: ::c_int = 2;
68-pub const SOCK_SEQPACKET: ::c_int = 5;
69
70 pub const EDEADLK: ::c_int = 35;
71 pub const ENAMETOOLONG: ::c_int = 36;
72--- a/src/unix/linux_like/linux/musl/b64/mod.rs
73+++ b/src/unix/linux_like/linux/musl/b64/mod.rs
74@@ -133,8 +133,6 @@ s! {
75 pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
76 pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
77
78-pub const SOCK_SEQPACKET: ::c_int = 5;
79-
80 extern "C" {
81 pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
82 }
83--- a/src/unix/linux_like/linux/musl/mod.rs
84+++ b/src/unix/linux_like/linux/musl/mod.rs
85@@ -530,6 +530,7 @@ pub const POSIX_MADV_DONTNEED: ::c_int =
86
87 pub const MAP_ANONYMOUS: ::c_int = MAP_ANON;
88
89+pub const SOCK_SEQPACKET: ::c_int = 5;
90 pub const SOCK_DCCP: ::c_int = 6;
91 pub const SOCK_NONBLOCK: ::c_int = O_NONBLOCK;
92 pub const SOCK_PACKET: ::c_int = 10;
diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch
new file mode 100644
index 0000000000..9c93434e03
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch
@@ -0,0 +1,140 @@
1From e4f6d7b6d57e83633814c54d93dff292ed0e4609 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 8 Apr 2023 09:01:54 -0700
4Subject: [PATCH] musl: Move F_OFD_GETLK, F_OFD_SETLK and F_OFD_SETLKW to
5 common location
6
7These defines are not architecture specific in musl [1] therefore move them
8to be common
9
10[1] https://git.musl-libc.org/cgit/musl/tree/include/fcntl.h#n48
11
12Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 src/unix/linux_like/linux/musl/b32/arm/mod.rs | 3 ---
16 src/unix/linux_like/linux/musl/b32/hexagon.rs | 3 ---
17 src/unix/linux_like/linux/musl/b32/mips/mod.rs | 3 ---
18 src/unix/linux_like/linux/musl/b32/powerpc.rs | 3 ---
19 src/unix/linux_like/linux/musl/b32/x86/mod.rs | 3 ---
20 src/unix/linux_like/linux/musl/b64/aarch64/mod.rs | 3 ---
21 src/unix/linux_like/linux/musl/b64/mips64.rs | 3 ---
22 src/unix/linux_like/linux/musl/mod.rs | 4 ++++
23 8 files changed, 4 insertions(+), 21 deletions(-)
24
25diff --git a/src/unix/linux_like/linux/musl/b32/arm/mod.rs b/src/unix/linux_like/linux/musl/b32/arm/mod.rs
26index c47fa2c4c..3c8978e4f 100644
27--- a/src/unix/linux_like/linux/musl/b32/arm/mod.rs
28+++ b/src/unix/linux_like/linux/musl/b32/arm/mod.rs
29@@ -451,9 +451,6 @@ pub const F_GETOWN: ::c_int = 9;
30 pub const F_SETLK: ::c_int = 13;
31 pub const F_SETLKW: ::c_int = 14;
32 pub const F_SETOWN: ::c_int = 8;
33-pub const F_OFD_GETLK: ::c_int = 36;
34-pub const F_OFD_SETLK: ::c_int = 37;
35-pub const F_OFD_SETLKW: ::c_int = 38;
36
37 pub const VEOF: usize = 4;
38 pub const VEOL: usize = 11;
39diff --git a/src/unix/linux_like/linux/musl/b32/hexagon.rs b/src/unix/linux_like/linux/musl/b32/hexagon.rs
40index f83d208d5..720c603da 100644
41--- a/src/unix/linux_like/linux/musl/b32/hexagon.rs
42+++ b/src/unix/linux_like/linux/musl/b32/hexagon.rs
43@@ -225,9 +225,6 @@ pub const F_GETOWN_EX: ::c_int = 16;
44 pub const F_GETSIG: ::c_int = 11;
45 pub const F_LINUX_SPECIFIC_BASE: ::c_int = 1024;
46 pub const FLUSHO: ::c_int = 4096;
47-pub const F_OFD_GETLK: ::c_int = 36;
48-pub const F_OFD_SETLK: ::c_int = 37;
49-pub const F_OFD_SETLKW: ::c_int = 38;
50 pub const F_OWNER_PGRP: ::c_int = 2;
51 pub const F_OWNER_PID: ::c_int = 1;
52 pub const F_OWNER_TID: ::c_int = 0;
53diff --git a/src/unix/linux_like/linux/musl/b32/mips/mod.rs b/src/unix/linux_like/linux/musl/b32/mips/mod.rs
54index d09b8278e..69e20ce32 100644
55--- a/src/unix/linux_like/linux/musl/b32/mips/mod.rs
56+++ b/src/unix/linux_like/linux/musl/b32/mips/mod.rs
57@@ -388,9 +388,6 @@ pub const F_GETOWN: ::c_int = 23;
58 pub const F_SETLK: ::c_int = 34;
59 pub const F_SETLKW: ::c_int = 35;
60 pub const F_SETOWN: ::c_int = 24;
61-pub const F_OFD_GETLK: ::c_int = 36;
62-pub const F_OFD_SETLK: ::c_int = 37;
63-pub const F_OFD_SETLKW: ::c_int = 38;
64
65 pub const VEOF: usize = 16;
66 pub const VEOL: usize = 17;
67diff --git a/src/unix/linux_like/linux/musl/b32/powerpc.rs b/src/unix/linux_like/linux/musl/b32/powerpc.rs
68index 3b998329b..63bc9163d 100644
69--- a/src/unix/linux_like/linux/musl/b32/powerpc.rs
70+++ b/src/unix/linux_like/linux/musl/b32/powerpc.rs
71@@ -384,9 +384,6 @@ pub const F_GETOWN: ::c_int = 9;
72 pub const F_SETLK: ::c_int = 13;
73 pub const F_SETLKW: ::c_int = 14;
74 pub const F_SETOWN: ::c_int = 8;
75-pub const F_OFD_GETLK: ::c_int = 36;
76-pub const F_OFD_SETLK: ::c_int = 37;
77-pub const F_OFD_SETLKW: ::c_int = 38;
78
79 pub const VEOF: usize = 4;
80 pub const VEOL: usize = 6;
81diff --git a/src/unix/linux_like/linux/musl/b32/x86/mod.rs b/src/unix/linux_like/linux/musl/b32/x86/mod.rs
82index c319b91b6..52ecf3c7e 100644
83--- a/src/unix/linux_like/linux/musl/b32/x86/mod.rs
84+++ b/src/unix/linux_like/linux/musl/b32/x86/mod.rs
85@@ -441,9 +441,6 @@ pub const F_GETOWN: ::c_int = 9;
86 pub const F_SETLK: ::c_int = 13;
87 pub const F_SETLKW: ::c_int = 14;
88 pub const F_SETOWN: ::c_int = 8;
89-pub const F_OFD_GETLK: ::c_int = 36;
90-pub const F_OFD_SETLK: ::c_int = 37;
91-pub const F_OFD_SETLKW: ::c_int = 38;
92
93 pub const VEOF: usize = 4;
94 pub const VEOL: usize = 11;
95diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
96index 14b4bc6d6..522493ff3 100644
97--- a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
98+++ b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
99@@ -250,9 +250,6 @@ pub const F_GETOWN: ::c_int = 9;
100 pub const F_SETLK: ::c_int = 6;
101 pub const F_SETLKW: ::c_int = 7;
102 pub const F_SETOWN: ::c_int = 8;
103-pub const F_OFD_GETLK: ::c_int = 36;
104-pub const F_OFD_SETLK: ::c_int = 37;
105-pub const F_OFD_SETLKW: ::c_int = 38;
106
107 pub const VEOF: usize = 4;
108
109diff --git a/src/unix/linux_like/linux/musl/b64/mips64.rs b/src/unix/linux_like/linux/musl/b64/mips64.rs
110index 22ac91690..c7f041260 100644
111--- a/src/unix/linux_like/linux/musl/b64/mips64.rs
112+++ b/src/unix/linux_like/linux/musl/b64/mips64.rs
113@@ -612,9 +612,6 @@ pub const F_GETOWN: ::c_int = 23;
114 pub const F_SETOWN: ::c_int = 24;
115 pub const F_SETLK: ::c_int = 6;
116 pub const F_SETLKW: ::c_int = 7;
117-pub const F_OFD_GETLK: ::c_int = 36;
118-pub const F_OFD_SETLK: ::c_int = 37;
119-pub const F_OFD_SETLKW: ::c_int = 38;
120
121 pub const MCL_CURRENT: ::c_int = 0x0001;
122 pub const MCL_FUTURE: ::c_int = 0x0002;
123diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
124index 37a8ca2af..9a4fa7ca7 100644
125--- a/src/unix/linux_like/linux/musl/mod.rs
126+++ b/src/unix/linux_like/linux/musl/mod.rs
127@@ -506,6 +506,10 @@ pub const ECOMM: ::c_int = 70;
128 pub const EPROTO: ::c_int = 71;
129 pub const EDOTDOT: ::c_int = 73;
130
131+pub const F_OFD_GETLK: ::c_int = 36;
132+pub const F_OFD_SETLK: ::c_int = 37;
133+pub const F_OFD_SETLKW: ::c_int = 38;
134+
135 pub const F_RDLCK: ::c_int = 0;
136 pub const F_WRLCK: ::c_int = 1;
137 pub const F_UNLCK: ::c_int = 2;
138--
1392.40.0
140
diff --git a/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch
new file mode 100644
index 0000000000..47969542c8
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyruvate/0001-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch
@@ -0,0 +1,35 @@
1From b87552c504b53a5e5df2438adfe24e35b0168aba Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 8 Apr 2023 08:51:02 -0700
4Subject: [PATCH] musl/riscv32: Define F_SETLK, F_SETLKW and fix F_GETLK
5
6F_SETLK and F_SETLKW were not defined therefore define them
7and F_GETLK value was not matching the musl port hence fixed
8
9Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/unix/linux_like/linux/musl/b32/riscv32/mod.rs | 6 ++++--
13 1 file changed, 4 insertions(+), 2 deletions(-)
14
15diff --git a/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs b/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs
16index 9ce6a9fd3..e56ff4853 100644
17--- a/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs
18+++ b/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs
19@@ -339,9 +339,11 @@ pub const POLLWRBAND: ::c_short = 512;
20 pub const O_ASYNC: ::c_int = 8192;
21 pub const O_NDELAY: ::c_int = 2048;
22 pub const EFD_NONBLOCK: ::c_int = 2048;
23-pub const F_GETLK: ::c_int = 5;
24-pub const F_GETOWN: ::c_int = 9;
25 pub const F_SETOWN: ::c_int = 8;
26+pub const F_GETOWN: ::c_int = 9;
27+pub const F_GETLK: ::c_int = 12;
28+pub const F_SETLK: ::c_int = 13;
29+pub const F_SETLKW: ::c_int = 14;
30 pub const SFD_NONBLOCK: ::c_int = 2048;
31 pub const TCSANOW: ::c_int = 0;
32 pub const TCSADRAIN: ::c_int = 1;
33--
342.40.0
35
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-30 08:27:04 +0000