From 3f91512ffc8c1c3374b3a67df5f86e884c78d7a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 12 Nov 2019 12:55:37 -0800 Subject: strace: Fix build found with 64bit time_t/musl This ensures that its using linux headers for matching the syscall structures Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../strace/strace/sys_headers.patch | 25 ++++++++++++++++++++++ meta/recipes-devtools/strace/strace_5.3.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta/recipes-devtools/strace/strace/sys_headers.patch diff --git a/meta/recipes-devtools/strace/strace/sys_headers.patch b/meta/recipes-devtools/strace/strace/sys_headers.patch new file mode 100644 index 0000000000..e46f2c350d --- /dev/null +++ b/meta/recipes-devtools/strace/strace/sys_headers.patch @@ -0,0 +1,25 @@ +Remove configure checks for few sys/ headers + +sys/ipc.h, sys/sem.h, sys/shm.h, and sys/msg.h are actually wrappers +for kernel headers in libc if available, here strace is trying to match +traced process's APIs to syscalls kernel structures + +Removing the checks makes it default to right kernel UAPI headers under linux/ + +Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2019-November/009222.html] +Suggested-by: Rich Felker +Signed-off-by: Khem Raj +--- a/configure.ac ++++ b/configure.ac +@@ -439,11 +439,7 @@ AC_CHECK_HEADERS(m4_normalize([ + sys/conf.h + sys/eventfd.h + sys/fanotify.h +- sys/ipc.h +- sys/msg.h + sys/quota.h +- sys/sem.h +- sys/shm.h + sys/signalfd.h + sys/xattr.h + ustat.h diff --git a/meta/recipes-devtools/strace/strace_5.3.bb b/meta/recipes-devtools/strace/strace_5.3.bb index db6004583b..b000afb30b 100644 --- a/meta/recipes-devtools/strace/strace_5.3.bb +++ b/meta/recipes-devtools/strace/strace_5.3.bb @@ -15,6 +15,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ file://ptest-spacesave.patch \ file://uintptr_t.patch \ + file://sys_headers.patch \ " SRC_URI[md5sum] = "84f5e72de813c9b1bb6057ee8ab428d8" SRC_URI[sha256sum] = "6c131198749656401fe3efd6b4b16a07ea867e8f530867ceae8930bbc937a047" -- cgit 1.2.3-korg