From 7d40c6ff1d1d64ebeeffb6bfc200dcd84861214a Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Fri, 17 Apr 2015 17:25:36 -0700 Subject: strace: fixes for compilation failures with musl Backports from upstream: http://sourceforge.net/p/strace/code/ci/d34e00b293942b1012ddc49ed3ab379a32337611 http://sourceforge.net/p/strace/code/ci/3460dc486d333231998de0f19918204aacee9ae3 Expected to be released officially as part of strace 4.11 Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- .../Include-linux-ioctl.h-for-_IOC_-macros.patch | 69 ++++++++++++++++++++++ .../strace/Include-sys-stat.h-for-S_I-macros.patch | 52 ++++++++++++++++ meta/recipes-devtools/strace/strace_4.10.bb | 2 + 3 files changed, 123 insertions(+) create mode 100644 meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch create mode 100644 meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch diff --git a/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch b/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch new file mode 100644 index 0000000000..d9346a8b71 --- /dev/null +++ b/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch @@ -0,0 +1,69 @@ +Upstream-Status: Backport + + http://sourceforge.net/p/strace/code/ci/3460dc486d333231998de0f19918204aacee9ae3 + +Expected to be released officially as part of strace 4.11 + +Signed-off-by: Andre McCurdy + +From 3460dc486d333231998de0f19918204aacee9ae3 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 28 Mar 2015 18:40:13 +0100 +Subject: [PATCH] Include for _IOC_* macros + +Fix a compilation failure with musl libc. + +* evdev.c: Include . +* ioctl.c: Include instead of . +* ioctlsort.c: Likewise. + +Reported-by: Dima Krasner +Acked-by: Mike Frysinger +--- + evdev.c | 2 ++ + ioctl.c | 2 +- + ioctlsort.c | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/evdev.c b/evdev.c +index 9a7430d..e06f9c1 100644 +--- a/evdev.c ++++ b/evdev.c +@@ -28,6 +28,8 @@ + + #include "defs.h" + ++#include ++ + #ifdef HAVE_LINUX_INPUT_H + #include + #include "xlat/evdev_abs.h" +diff --git a/ioctl.c b/ioctl.c +index 46f8334..c67d048 100644 +--- a/ioctl.c ++++ b/ioctl.c +@@ -29,7 +29,7 @@ + */ + + #include "defs.h" +-#include ++#include + #include "xlat/ioctl_dirs.h" + + #ifdef HAVE_LINUX_INPUT_H +diff --git a/ioctlsort.c b/ioctlsort.c +index 333556c..9c31691 100644 +--- a/ioctlsort.c ++++ b/ioctlsort.c +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + struct ioctlent { + const char *info; +-- +1.9.1 + diff --git a/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch b/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch new file mode 100644 index 0000000000..0b072fe533 --- /dev/null +++ b/meta/recipes-devtools/strace/strace/Include-sys-stat.h-for-S_I-macros.patch @@ -0,0 +1,52 @@ +Upstream-Status: Backport + + http://sourceforge.net/p/strace/code/ci/d34e00b293942b1012ddc49ed3ab379a32337611 + +Expected to be released officially as part of strace 4.11 + +Signed-off-by: Andre McCurdy + +From d34e00b293942b1012ddc49ed3ab379a32337611 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 28 Mar 2015 18:21:09 +0100 +Subject: [PATCH] Include for S_I* macros + +Fix a compilation failure with musl libc. + +* mknod.c: Include . +* printmode.c: Likewise. + +Reported-by: Dima Krasner +Acked-by: Mike Frysinger +--- + mknod.c | 1 + + printmode.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/mknod.c b/mknod.c +index 07e9a45..1463232 100644 +--- a/mknod.c ++++ b/mknod.c +@@ -1,6 +1,7 @@ + #include "defs.h" + + #include ++#include + + #ifdef MAJOR_IN_SYSMACROS + # include +diff --git a/printmode.c b/printmode.c +index 4df1b9f..a721936 100644 +--- a/printmode.c ++++ b/printmode.c +@@ -1,6 +1,7 @@ + #include "defs.h" + + #include ++#include + + #include "xlat/modetypes.h" + +-- +1.9.1 + diff --git a/meta/recipes-devtools/strace/strace_4.10.bb b/meta/recipes-devtools/strace/strace_4.10.bb index 707cb765c9..07a1076bba 100644 --- a/meta/recipes-devtools/strace/strace_4.10.bb +++ b/meta/recipes-devtools/strace/strace_4.10.bb @@ -10,6 +10,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ file://strace-add-configure-options.patch \ file://Makefile-ptest.patch \ file://run-ptest \ + file://Include-sys-stat.h-for-S_I-macros.patch \ + file://Include-linux-ioctl.h-for-_IOC_-macros.patch \ " SRC_URI[md5sum] = "107a5be455493861189e9b57a3a51912" -- cgit 1.2.3-korg