Skip to contentSkip to conversation

android-tools: Support libselinux to build with musl which now has gettid

PATCH New Khem Raj 1 participant 1 message Sep 10, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 android-tools: Support libselinux to build with musl which now has gettid

---
 ...t-define-gettid-if-glibc-2.30-is-use.patch | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)
meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch +9 -12
index 8524517cb6..87771cba85 100644
@@ -29,24 +29,21 @@ Signed-off-by: Khem Raj <[email protected]>
 
 --- a/src/procattr.c
 +++ b/src/procattr.c
-@@ -8,7 +8,19 @@
+@@ -8,12 +8,16 @@
  #include "selinux_internal.h"
  #include "policy.h"
  
 -#ifndef __BIONIC__
 +/* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and
 + * has a definition for it */
-+#ifdef __BIONIC__
-+  #define OVERRIDE_GETTID 0
-+#elif !defined(__GLIBC_PREREQ)
-+  #define OVERRIDE_GETTID 1
-+#elif !__GLIBC_PREREQ(2,29)
-+  #define OVERRIDE_GETTID 1
-+#else
-+  #define OVERRIDE_GETTID 0
-+#endif
-+
-+#if OVERRIDE_GETTID
++#if defined(__GLIBC_)
++#if !__GLIBC_PREREQ(2,30)
  static pid_t gettid(void)
  {
  	return syscall(__NR_gettid);
+ }
+ #endif
++#endif
+ 
+ static int getprocattrcon(char ** context,
+ 			  pid_t pid, const char *attr)
Signature · 1 line
2.28.0