mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-02-26 06:10:50 +00:00
python3-pyruvate: Upgrade to 1.2.1
Add fixes to build with musl and riscv32 Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
@@ -19,7 +19,9 @@ currently the build fails on mips archirecture with type mismatches
|
||||
296 | device: stat.st_dev,
|
||||
| ^^^^^^^^^^^ expected `u64`, found `u32`
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/lucab/libsystemd-rs/pull/103]
|
||||
Drop this patch when libsystemd-rs crate bumps to 0.6.0+
|
||||
|
||||
Upstream-Status: Backport [https://github.com/lucab/libsystemd-rs/pull/104]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/logging.rs | 3 +++
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
From fdf98602ad20d06ebf65574541caac68ca421ac4 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 8 Apr 2023 09:19:53 -0700
|
||||
Subject: [PATCH] musl: Define O_LARGEFILE for riscv32
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/unix/linux_like/linux/musl/b32/riscv32/mod.rs | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
--- a/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs
|
||||
@@ -370,6 +370,7 @@ pub const __SIZEOF_PTHREAD_CONDATTR_T: u
|
||||
pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
|
||||
pub const O_DIRECT: ::c_int = 16384;
|
||||
pub const O_DIRECTORY: ::c_int = 65536;
|
||||
+pub const O_LARGEFILE: ::c_int = 0o0100000;
|
||||
pub const O_NOFOLLOW: ::c_int = 131072;
|
||||
pub const MAP_HUGETLB: ::c_int = 262144;
|
||||
pub const MAP_LOCKED: ::c_int = 8192;
|
||||
@@ -0,0 +1,99 @@
|
||||
From f2b06fa4ea6ec9a33f8b269f0a1730a26276c5b0 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 8 Apr 2023 08:25:46 -0700
|
||||
Subject: [PATCH] musl: Define SOCK_NONBLOCK with O_NONBLOCK
|
||||
|
||||
Much like glibc, these defines are same on musl [1] [2]
|
||||
therefore consolidate the definition in one place
|
||||
for SOCK_NONBLOCK
|
||||
|
||||
[1] https://github.com/search?q=repo%3Abminor%2Fmusl++%22%23define+SOCK_NONBLOCK%22&type=code
|
||||
[2] https://github.com/search?q=repo%3Abminor%2Fmusl++%22%23define+O_NONBLOCK%22&type=code
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/unix/linux_like/linux/musl/b32/arm/mod.rs | 2 --
|
||||
src/unix/linux_like/linux/musl/b32/hexagon.rs | 1 -
|
||||
src/unix/linux_like/linux/musl/b32/mips/mod.rs | 2 --
|
||||
src/unix/linux_like/linux/musl/b32/powerpc.rs | 2 --
|
||||
src/unix/linux_like/linux/musl/b32/x86/mod.rs | 2 --
|
||||
src/unix/linux_like/linux/musl/b64/mod.rs | 2 --
|
||||
src/unix/linux_like/linux/musl/mod.rs | 1 +
|
||||
7 files changed, 1 insertion(+), 11 deletions(-)
|
||||
|
||||
--- a/src/unix/linux_like/linux/musl/b32/arm/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/arm/mod.rs
|
||||
@@ -311,8 +311,6 @@ pub const O_SYNC: ::c_int = 1052672;
|
||||
pub const O_RSYNC: ::c_int = 1052672;
|
||||
pub const O_DSYNC: ::c_int = 4096;
|
||||
|
||||
-pub const SOCK_NONBLOCK: ::c_int = 2048;
|
||||
-
|
||||
pub const MAP_ANON: ::c_int = 0x0020;
|
||||
pub const MAP_GROWSDOWN: ::c_int = 0x0100;
|
||||
pub const MAP_DENYWRITE: ::c_int = 0x0800;
|
||||
--- a/src/unix/linux_like/linux/musl/b32/hexagon.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/hexagon.rs
|
||||
@@ -295,7 +295,6 @@ pub const SIG_SETMASK: ::c_int = 2; // F
|
||||
pub const SIG_BLOCK: ::c_int = 0x000000;
|
||||
pub const SIG_UNBLOCK: ::c_int = 0x01;
|
||||
pub const SOCK_DGRAM: ::c_int = 2;
|
||||
-pub const SOCK_NONBLOCK: ::c_int = 2048;
|
||||
pub const SOCK_SEQPACKET: ::c_int = 5;
|
||||
pub const SOCK_STREAM: ::c_int = 1;
|
||||
pub const SOL_CAIF: ::c_int = 278;
|
||||
--- a/src/unix/linux_like/linux/musl/b32/mips/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/mips/mod.rs
|
||||
@@ -250,8 +250,6 @@ pub const O_SYNC: ::c_int = 0o40020;
|
||||
pub const O_RSYNC: ::c_int = 0o40020;
|
||||
pub const O_DSYNC: ::c_int = 0o020;
|
||||
|
||||
-pub const SOCK_NONBLOCK: ::c_int = 0o200;
|
||||
-
|
||||
pub const MAP_ANON: ::c_int = 0x800;
|
||||
pub const MAP_GROWSDOWN: ::c_int = 0x1000;
|
||||
pub const MAP_DENYWRITE: ::c_int = 0x2000;
|
||||
--- a/src/unix/linux_like/linux/musl/b32/powerpc.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/powerpc.rs
|
||||
@@ -243,8 +243,6 @@ pub const O_SYNC: ::c_int = 1052672;
|
||||
pub const O_RSYNC: ::c_int = 1052672;
|
||||
pub const O_DSYNC: ::c_int = 4096;
|
||||
|
||||
-pub const SOCK_NONBLOCK: ::c_int = 2048;
|
||||
-
|
||||
pub const MAP_ANON: ::c_int = 0x0020;
|
||||
pub const MAP_GROWSDOWN: ::c_int = 0x0100;
|
||||
pub const MAP_DENYWRITE: ::c_int = 0x0800;
|
||||
--- a/src/unix/linux_like/linux/musl/b32/x86/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/x86/mod.rs
|
||||
@@ -300,8 +300,6 @@ pub const O_SYNC: ::c_int = 1052672;
|
||||
pub const O_RSYNC: ::c_int = 1052672;
|
||||
pub const O_DSYNC: ::c_int = 4096;
|
||||
|
||||
-pub const SOCK_NONBLOCK: ::c_int = 2048;
|
||||
-
|
||||
pub const MAP_ANON: ::c_int = 0x0020;
|
||||
pub const MAP_GROWSDOWN: ::c_int = 0x0100;
|
||||
pub const MAP_DENYWRITE: ::c_int = 0x0800;
|
||||
--- a/src/unix/linux_like/linux/musl/b64/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b64/mod.rs
|
||||
@@ -133,8 +133,6 @@ s! {
|
||||
pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
|
||||
pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
|
||||
|
||||
-pub const SOCK_NONBLOCK: ::c_int = 2048;
|
||||
-
|
||||
pub const SOCK_SEQPACKET: ::c_int = 5;
|
||||
|
||||
extern "C" {
|
||||
--- a/src/unix/linux_like/linux/musl/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/mod.rs
|
||||
@@ -527,6 +527,7 @@ pub const POSIX_MADV_DONTNEED: ::c_int =
|
||||
pub const MAP_ANONYMOUS: ::c_int = MAP_ANON;
|
||||
|
||||
pub const SOCK_DCCP: ::c_int = 6;
|
||||
+pub const SOCK_NONBLOCK: ::c_int = O_NONBLOCK;
|
||||
pub const SOCK_PACKET: ::c_int = 10;
|
||||
|
||||
pub const SOMAXCONN: ::c_int = 128;
|
||||
@@ -0,0 +1,92 @@
|
||||
From e00da82cd46221bfb650895c9cea65082da66b4e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 8 Apr 2023 09:25:31 -0700
|
||||
Subject: [PATCH] musl: Define SOCK_SEQPACKET in common place
|
||||
|
||||
This define is not architecture specific in musl [1]
|
||||
|
||||
[1] https://git.musl-libc.org/cgit/musl/tree/include/sys/socket.h#n90
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/unix/linux_like/linux/musl/b32/arm/mod.rs | 1 -
|
||||
src/unix/linux_like/linux/musl/b32/hexagon.rs | 1 -
|
||||
src/unix/linux_like/linux/musl/b32/mips/mod.rs | 1 -
|
||||
src/unix/linux_like/linux/musl/b32/powerpc.rs | 1 -
|
||||
src/unix/linux_like/linux/musl/b32/x86/mod.rs | 1 -
|
||||
src/unix/linux_like/linux/musl/b64/mod.rs | 2 --
|
||||
src/unix/linux_like/linux/musl/mod.rs | 1 +
|
||||
7 files changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
--- a/src/unix/linux_like/linux/musl/b32/arm/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/arm/mod.rs
|
||||
@@ -324,7 +324,6 @@ pub const MAP_SYNC: ::c_int = 0x080000;
|
||||
|
||||
pub const SOCK_STREAM: ::c_int = 1;
|
||||
pub const SOCK_DGRAM: ::c_int = 2;
|
||||
-pub const SOCK_SEQPACKET: ::c_int = 5;
|
||||
|
||||
pub const EDEADLK: ::c_int = 35;
|
||||
pub const ENAMETOOLONG: ::c_int = 36;
|
||||
--- a/src/unix/linux_like/linux/musl/b32/hexagon.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/hexagon.rs
|
||||
@@ -292,7 +292,6 @@ pub const SIG_SETMASK: ::c_int = 2; // F
|
||||
pub const SIG_BLOCK: ::c_int = 0x000000;
|
||||
pub const SIG_UNBLOCK: ::c_int = 0x01;
|
||||
pub const SOCK_DGRAM: ::c_int = 2;
|
||||
-pub const SOCK_SEQPACKET: ::c_int = 5;
|
||||
pub const SOCK_STREAM: ::c_int = 1;
|
||||
pub const SOL_CAIF: ::c_int = 278;
|
||||
pub const SOL_IUCV: ::c_int = 277;
|
||||
--- a/src/unix/linux_like/linux/musl/b32/mips/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/mips/mod.rs
|
||||
@@ -348,7 +348,6 @@ pub const ERFKILL: ::c_int = 167;
|
||||
|
||||
pub const SOCK_STREAM: ::c_int = 2;
|
||||
pub const SOCK_DGRAM: ::c_int = 1;
|
||||
-pub const SOCK_SEQPACKET: ::c_int = 5;
|
||||
|
||||
pub const SA_ONSTACK: ::c_int = 0x08000000;
|
||||
pub const SA_SIGINFO: ::c_int = 8;
|
||||
--- a/src/unix/linux_like/linux/musl/b32/powerpc.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/powerpc.rs
|
||||
@@ -255,7 +255,6 @@ pub const MAP_STACK: ::c_int = 0x020000;
|
||||
|
||||
pub const SOCK_STREAM: ::c_int = 1;
|
||||
pub const SOCK_DGRAM: ::c_int = 2;
|
||||
-pub const SOCK_SEQPACKET: ::c_int = 5;
|
||||
|
||||
pub const EDEADLK: ::c_int = 35;
|
||||
pub const ENAMETOOLONG: ::c_int = 36;
|
||||
--- a/src/unix/linux_like/linux/musl/b32/x86/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/x86/mod.rs
|
||||
@@ -313,7 +313,6 @@ pub const MAP_SYNC: ::c_int = 0x080000;
|
||||
|
||||
pub const SOCK_STREAM: ::c_int = 1;
|
||||
pub const SOCK_DGRAM: ::c_int = 2;
|
||||
-pub const SOCK_SEQPACKET: ::c_int = 5;
|
||||
|
||||
pub const EDEADLK: ::c_int = 35;
|
||||
pub const ENAMETOOLONG: ::c_int = 36;
|
||||
--- a/src/unix/linux_like/linux/musl/b64/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b64/mod.rs
|
||||
@@ -133,8 +133,6 @@ s! {
|
||||
pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
|
||||
pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
|
||||
|
||||
-pub const SOCK_SEQPACKET: ::c_int = 5;
|
||||
-
|
||||
extern "C" {
|
||||
pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
|
||||
}
|
||||
--- a/src/unix/linux_like/linux/musl/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/mod.rs
|
||||
@@ -530,6 +530,7 @@ pub const POSIX_MADV_DONTNEED: ::c_int =
|
||||
|
||||
pub const MAP_ANONYMOUS: ::c_int = MAP_ANON;
|
||||
|
||||
+pub const SOCK_SEQPACKET: ::c_int = 5;
|
||||
pub const SOCK_DCCP: ::c_int = 6;
|
||||
pub const SOCK_NONBLOCK: ::c_int = O_NONBLOCK;
|
||||
pub const SOCK_PACKET: ::c_int = 10;
|
||||
@@ -0,0 +1,140 @@
|
||||
From e4f6d7b6d57e83633814c54d93dff292ed0e4609 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 8 Apr 2023 09:01:54 -0700
|
||||
Subject: [PATCH] musl: Move F_OFD_GETLK, F_OFD_SETLK and F_OFD_SETLKW to
|
||||
common location
|
||||
|
||||
These defines are not architecture specific in musl [1] therefore move them
|
||||
to be common
|
||||
|
||||
[1] https://git.musl-libc.org/cgit/musl/tree/include/fcntl.h#n48
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/unix/linux_like/linux/musl/b32/arm/mod.rs | 3 ---
|
||||
src/unix/linux_like/linux/musl/b32/hexagon.rs | 3 ---
|
||||
src/unix/linux_like/linux/musl/b32/mips/mod.rs | 3 ---
|
||||
src/unix/linux_like/linux/musl/b32/powerpc.rs | 3 ---
|
||||
src/unix/linux_like/linux/musl/b32/x86/mod.rs | 3 ---
|
||||
src/unix/linux_like/linux/musl/b64/aarch64/mod.rs | 3 ---
|
||||
src/unix/linux_like/linux/musl/b64/mips64.rs | 3 ---
|
||||
src/unix/linux_like/linux/musl/mod.rs | 4 ++++
|
||||
8 files changed, 4 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/src/unix/linux_like/linux/musl/b32/arm/mod.rs b/src/unix/linux_like/linux/musl/b32/arm/mod.rs
|
||||
index c47fa2c4c..3c8978e4f 100644
|
||||
--- a/src/unix/linux_like/linux/musl/b32/arm/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/arm/mod.rs
|
||||
@@ -451,9 +451,6 @@ pub const F_GETOWN: ::c_int = 9;
|
||||
pub const F_SETLK: ::c_int = 13;
|
||||
pub const F_SETLKW: ::c_int = 14;
|
||||
pub const F_SETOWN: ::c_int = 8;
|
||||
-pub const F_OFD_GETLK: ::c_int = 36;
|
||||
-pub const F_OFD_SETLK: ::c_int = 37;
|
||||
-pub const F_OFD_SETLKW: ::c_int = 38;
|
||||
|
||||
pub const VEOF: usize = 4;
|
||||
pub const VEOL: usize = 11;
|
||||
diff --git a/src/unix/linux_like/linux/musl/b32/hexagon.rs b/src/unix/linux_like/linux/musl/b32/hexagon.rs
|
||||
index f83d208d5..720c603da 100644
|
||||
--- a/src/unix/linux_like/linux/musl/b32/hexagon.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/hexagon.rs
|
||||
@@ -225,9 +225,6 @@ pub const F_GETOWN_EX: ::c_int = 16;
|
||||
pub const F_GETSIG: ::c_int = 11;
|
||||
pub const F_LINUX_SPECIFIC_BASE: ::c_int = 1024;
|
||||
pub const FLUSHO: ::c_int = 4096;
|
||||
-pub const F_OFD_GETLK: ::c_int = 36;
|
||||
-pub const F_OFD_SETLK: ::c_int = 37;
|
||||
-pub const F_OFD_SETLKW: ::c_int = 38;
|
||||
pub const F_OWNER_PGRP: ::c_int = 2;
|
||||
pub const F_OWNER_PID: ::c_int = 1;
|
||||
pub const F_OWNER_TID: ::c_int = 0;
|
||||
diff --git a/src/unix/linux_like/linux/musl/b32/mips/mod.rs b/src/unix/linux_like/linux/musl/b32/mips/mod.rs
|
||||
index d09b8278e..69e20ce32 100644
|
||||
--- a/src/unix/linux_like/linux/musl/b32/mips/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/mips/mod.rs
|
||||
@@ -388,9 +388,6 @@ pub const F_GETOWN: ::c_int = 23;
|
||||
pub const F_SETLK: ::c_int = 34;
|
||||
pub const F_SETLKW: ::c_int = 35;
|
||||
pub const F_SETOWN: ::c_int = 24;
|
||||
-pub const F_OFD_GETLK: ::c_int = 36;
|
||||
-pub const F_OFD_SETLK: ::c_int = 37;
|
||||
-pub const F_OFD_SETLKW: ::c_int = 38;
|
||||
|
||||
pub const VEOF: usize = 16;
|
||||
pub const VEOL: usize = 17;
|
||||
diff --git a/src/unix/linux_like/linux/musl/b32/powerpc.rs b/src/unix/linux_like/linux/musl/b32/powerpc.rs
|
||||
index 3b998329b..63bc9163d 100644
|
||||
--- a/src/unix/linux_like/linux/musl/b32/powerpc.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/powerpc.rs
|
||||
@@ -384,9 +384,6 @@ pub const F_GETOWN: ::c_int = 9;
|
||||
pub const F_SETLK: ::c_int = 13;
|
||||
pub const F_SETLKW: ::c_int = 14;
|
||||
pub const F_SETOWN: ::c_int = 8;
|
||||
-pub const F_OFD_GETLK: ::c_int = 36;
|
||||
-pub const F_OFD_SETLK: ::c_int = 37;
|
||||
-pub const F_OFD_SETLKW: ::c_int = 38;
|
||||
|
||||
pub const VEOF: usize = 4;
|
||||
pub const VEOL: usize = 6;
|
||||
diff --git a/src/unix/linux_like/linux/musl/b32/x86/mod.rs b/src/unix/linux_like/linux/musl/b32/x86/mod.rs
|
||||
index c319b91b6..52ecf3c7e 100644
|
||||
--- a/src/unix/linux_like/linux/musl/b32/x86/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/x86/mod.rs
|
||||
@@ -441,9 +441,6 @@ pub const F_GETOWN: ::c_int = 9;
|
||||
pub const F_SETLK: ::c_int = 13;
|
||||
pub const F_SETLKW: ::c_int = 14;
|
||||
pub const F_SETOWN: ::c_int = 8;
|
||||
-pub const F_OFD_GETLK: ::c_int = 36;
|
||||
-pub const F_OFD_SETLK: ::c_int = 37;
|
||||
-pub const F_OFD_SETLKW: ::c_int = 38;
|
||||
|
||||
pub const VEOF: usize = 4;
|
||||
pub const VEOL: usize = 11;
|
||||
diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
|
||||
index 14b4bc6d6..522493ff3 100644
|
||||
--- a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
|
||||
@@ -250,9 +250,6 @@ pub const F_GETOWN: ::c_int = 9;
|
||||
pub const F_SETLK: ::c_int = 6;
|
||||
pub const F_SETLKW: ::c_int = 7;
|
||||
pub const F_SETOWN: ::c_int = 8;
|
||||
-pub const F_OFD_GETLK: ::c_int = 36;
|
||||
-pub const F_OFD_SETLK: ::c_int = 37;
|
||||
-pub const F_OFD_SETLKW: ::c_int = 38;
|
||||
|
||||
pub const VEOF: usize = 4;
|
||||
|
||||
diff --git a/src/unix/linux_like/linux/musl/b64/mips64.rs b/src/unix/linux_like/linux/musl/b64/mips64.rs
|
||||
index 22ac91690..c7f041260 100644
|
||||
--- a/src/unix/linux_like/linux/musl/b64/mips64.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b64/mips64.rs
|
||||
@@ -612,9 +612,6 @@ pub const F_GETOWN: ::c_int = 23;
|
||||
pub const F_SETOWN: ::c_int = 24;
|
||||
pub const F_SETLK: ::c_int = 6;
|
||||
pub const F_SETLKW: ::c_int = 7;
|
||||
-pub const F_OFD_GETLK: ::c_int = 36;
|
||||
-pub const F_OFD_SETLK: ::c_int = 37;
|
||||
-pub const F_OFD_SETLKW: ::c_int = 38;
|
||||
|
||||
pub const MCL_CURRENT: ::c_int = 0x0001;
|
||||
pub const MCL_FUTURE: ::c_int = 0x0002;
|
||||
diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
|
||||
index 37a8ca2af..9a4fa7ca7 100644
|
||||
--- a/src/unix/linux_like/linux/musl/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/mod.rs
|
||||
@@ -506,6 +506,10 @@ pub const ECOMM: ::c_int = 70;
|
||||
pub const EPROTO: ::c_int = 71;
|
||||
pub const EDOTDOT: ::c_int = 73;
|
||||
|
||||
+pub const F_OFD_GETLK: ::c_int = 36;
|
||||
+pub const F_OFD_SETLK: ::c_int = 37;
|
||||
+pub const F_OFD_SETLKW: ::c_int = 38;
|
||||
+
|
||||
pub const F_RDLCK: ::c_int = 0;
|
||||
pub const F_WRLCK: ::c_int = 1;
|
||||
pub const F_UNLCK: ::c_int = 2;
|
||||
--
|
||||
2.40.0
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From b87552c504b53a5e5df2438adfe24e35b0168aba Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 8 Apr 2023 08:51:02 -0700
|
||||
Subject: [PATCH] musl/riscv32: Define F_SETLK, F_SETLKW and fix F_GETLK
|
||||
|
||||
F_SETLK and F_SETLKW were not defined therefore define them
|
||||
and F_GETLK value was not matching the musl port hence fixed
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/3191]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/unix/linux_like/linux/musl/b32/riscv32/mod.rs | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs b/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs
|
||||
index 9ce6a9fd3..e56ff4853 100644
|
||||
--- a/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs
|
||||
+++ b/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs
|
||||
@@ -339,9 +339,11 @@ pub const POLLWRBAND: ::c_short = 512;
|
||||
pub const O_ASYNC: ::c_int = 8192;
|
||||
pub const O_NDELAY: ::c_int = 2048;
|
||||
pub const EFD_NONBLOCK: ::c_int = 2048;
|
||||
-pub const F_GETLK: ::c_int = 5;
|
||||
-pub const F_GETOWN: ::c_int = 9;
|
||||
pub const F_SETOWN: ::c_int = 8;
|
||||
+pub const F_GETOWN: ::c_int = 9;
|
||||
+pub const F_GETLK: ::c_int = 12;
|
||||
+pub const F_SETLK: ::c_int = 13;
|
||||
+pub const F_SETLKW: ::c_int = 14;
|
||||
pub const SFD_NONBLOCK: ::c_int = 2048;
|
||||
pub const TCSANOW: ::c_int = 0;
|
||||
pub const TCSADRAIN: ::c_int = 1;
|
||||
--
|
||||
2.40.0
|
||||
|
||||
Reference in New Issue
Block a user