summaryrefslogtreecommitdiffstats
path: root/recipes-security/selinux/libselinux/0001-libselinux-do-not-define-gettid-for-musl.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-security/selinux/libselinux/0001-libselinux-do-not-define-gettid-for-musl.patch')
-rw-r--r--recipes-security/selinux/libselinux/0001-libselinux-do-not-define-gettid-for-musl.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/recipes-security/selinux/libselinux/0001-libselinux-do-not-define-gettid-for-musl.patch b/recipes-security/selinux/libselinux/0001-libselinux-do-not-define-gettid-for-musl.patch
deleted file mode 100644
index 5d6e409..0000000
--- a/recipes-security/selinux/libselinux/0001-libselinux-do-not-define-gettid-for-musl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 5f6f4a095bc82b29c3871d4d8a15d9c16cef39ef Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Wed, 6 Jan 2021 10:42:11 +0800
4Subject: [PATCH] libselinux: do not define gettid() for musl
5
6The musl has implemented gettid() function:
7http://git.musl-libc.org/cgit/musl/commit/?id=d49cf07541bb54a5ac7aec1feec8514db33db8ea
8
9Fixes:
10procattr.c:38:14: error: static declaration of 'gettid' follows non-static declaration
11 38 | static pid_t gettid(void)
12 | ^~~~~~
13In file included from procattr.c:2:
14/build/tmp/work/core2-32-poky-linux-musl/libselinux/3.1-r0/recipe-sysroot/usr/include/unistd.h:194:7:
15note: previous declaration of 'gettid' was here
16 194 | pid_t gettid(void);
17 | ^~~~~~
18
19Upstream-Status: Pending
20
21Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
22---
23 src/procattr.c | 8 +-------
24 1 file changed, 1 insertion(+), 7 deletions(-)
25
26diff --git a/src/procattr.c b/src/procattr.c
27index 926ee54..519e515 100644
28--- a/src/procattr.c
29+++ b/src/procattr.c
30@@ -24,13 +24,7 @@ static __thread char destructor_initialized;
31
32 /* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and
33 * has a definition for it */
34-#ifdef __BIONIC__
35- #define OVERRIDE_GETTID 0
36-#elif !defined(__GLIBC_PREREQ)
37- #define OVERRIDE_GETTID 1
38-#elif !__GLIBC_PREREQ(2,30)
39- #define OVERRIDE_GETTID 1
40-#else
41+#if !defined(__GLIBC_)
42 #define OVERRIDE_GETTID 0
43 #endif
44
45--
462.17.1
47