diff options
Diffstat (limited to 'poky/meta/recipes-devtools/strace')
-rw-r--r-- | poky/meta/recipes-devtools/strace/strace/sys_headers.patch | 25 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/strace/strace/uintptr_t.patch | 17 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/strace/strace_5.3.bb | 2 |
3 files changed, 44 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/strace/strace/sys_headers.patch b/poky/meta/recipes-devtools/strace/strace/sys_headers.patch new file mode 100644 index 000000000..e46f2c350 --- /dev/null +++ b/poky/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 <dalias@aerifal.cx> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- 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/poky/meta/recipes-devtools/strace/strace/uintptr_t.patch b/poky/meta/recipes-devtools/strace/strace/uintptr_t.patch new file mode 100644 index 000000000..6d3dd6fb9 --- /dev/null +++ b/poky/meta/recipes-devtools/strace/strace/uintptr_t.patch @@ -0,0 +1,17 @@ +include stdint.h for getting uintptr_t definition + +fixes do_compile_ptest_base +tests/fanotify_mark.c:191:23: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/tests/fanotify_mark.c ++++ b/tests/fanotify_mark.c +@@ -18,6 +18,7 @@ + + # include <limits.h> + # include <stdio.h> ++# include <stdint.h> + # include <unistd.h> + # include <sys/fanotify.h> + diff --git a/poky/meta/recipes-devtools/strace/strace_5.3.bb b/poky/meta/recipes-devtools/strace/strace_5.3.bb index 775a22fc6..b000afb30 100644 --- a/poky/meta/recipes-devtools/strace/strace_5.3.bb +++ b/poky/meta/recipes-devtools/strace/strace_5.3.bb @@ -14,6 +14,8 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ 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" |