Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 8e7b46e2350c3689938f309eaca929aada20b5a0 / . / meta-openembedded / meta-python / recipes-devtools / python / python3-pyruvate / 0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch
blob: e19b50d30d966b39c77f02b8c622c2b835f4e2f6 [file] [log] [blame]
Patrick Williams8e7b46e2023-05-01 14:19:06 -0500[diff] [blame^]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;