Signed-off-by: Khem Raj <[email protected]> --- ...t-define-gettid-if-glibc-2.30-is-use.patch | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch b/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch index 8524517cb6..87771cba85 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch +++ b/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch @@ -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) -- 2.28.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#86980): https://lists.openembedded.org/g/openembedded-devel/message/86980 Mute This Topic: https://lists.openembedded.org/mt/76760676/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
