diff options
Diffstat (limited to 'meta')
3 files changed, 123 insertions, 0 deletions
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 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | http://sourceforge.net/p/strace/code/ci/3460dc486d333231998de0f19918204aacee9ae3 | ||
4 | |||
5 | Expected to be released officially as part of strace 4.11 | ||
6 | |||
7 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
8 | |||
9 | From 3460dc486d333231998de0f19918204aacee9ae3 Mon Sep 17 00:00:00 2001 | ||
10 | From: Felix Janda <felix.janda@posteo.de> | ||
11 | Date: Sat, 28 Mar 2015 18:40:13 +0100 | ||
12 | Subject: [PATCH] Include <linux/ioctl.h> for _IOC_* macros | ||
13 | |||
14 | Fix a compilation failure with musl libc. | ||
15 | |||
16 | * evdev.c: Include <linux/ioctl.h>. | ||
17 | * ioctl.c: Include <linux/ioctl.h> instead of <asm/ioctl.h>. | ||
18 | * ioctlsort.c: Likewise. | ||
19 | |||
20 | Reported-by: Dima Krasner <dima@dimakrasner.com> | ||
21 | Acked-by: Mike Frysinger <vapier@gentoo.org> | ||
22 | --- | ||
23 | evdev.c | 2 ++ | ||
24 | ioctl.c | 2 +- | ||
25 | ioctlsort.c | 2 +- | ||
26 | 3 files changed, 4 insertions(+), 2 deletions(-) | ||
27 | |||
28 | diff --git a/evdev.c b/evdev.c | ||
29 | index 9a7430d..e06f9c1 100644 | ||
30 | --- a/evdev.c | ||
31 | +++ b/evdev.c | ||
32 | @@ -28,6 +28,8 @@ | ||
33 | |||
34 | #include "defs.h" | ||
35 | |||
36 | +#include <linux/ioctl.h> | ||
37 | + | ||
38 | #ifdef HAVE_LINUX_INPUT_H | ||
39 | #include <linux/input.h> | ||
40 | #include "xlat/evdev_abs.h" | ||
41 | diff --git a/ioctl.c b/ioctl.c | ||
42 | index 46f8334..c67d048 100644 | ||
43 | --- a/ioctl.c | ||
44 | +++ b/ioctl.c | ||
45 | @@ -29,7 +29,7 @@ | ||
46 | */ | ||
47 | |||
48 | #include "defs.h" | ||
49 | -#include <asm/ioctl.h> | ||
50 | +#include <linux/ioctl.h> | ||
51 | #include "xlat/ioctl_dirs.h" | ||
52 | |||
53 | #ifdef HAVE_LINUX_INPUT_H | ||
54 | diff --git a/ioctlsort.c b/ioctlsort.c | ||
55 | index 333556c..9c31691 100644 | ||
56 | --- a/ioctlsort.c | ||
57 | +++ b/ioctlsort.c | ||
58 | @@ -33,7 +33,7 @@ | ||
59 | #include <stdio.h> | ||
60 | #include <stdlib.h> | ||
61 | #include <string.h> | ||
62 | -#include <asm/ioctl.h> | ||
63 | +#include <linux/ioctl.h> | ||
64 | |||
65 | struct ioctlent { | ||
66 | const char *info; | ||
67 | -- | ||
68 | 1.9.1 | ||
69 | |||
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 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | http://sourceforge.net/p/strace/code/ci/d34e00b293942b1012ddc49ed3ab379a32337611 | ||
4 | |||
5 | Expected to be released officially as part of strace 4.11 | ||
6 | |||
7 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
8 | |||
9 | From d34e00b293942b1012ddc49ed3ab379a32337611 Mon Sep 17 00:00:00 2001 | ||
10 | From: Felix Janda <felix.janda@posteo.de> | ||
11 | Date: Sat, 28 Mar 2015 18:21:09 +0100 | ||
12 | Subject: [PATCH] Include <sys/stat.h> for S_I* macros | ||
13 | |||
14 | Fix a compilation failure with musl libc. | ||
15 | |||
16 | * mknod.c: Include <sys/stat.h>. | ||
17 | * printmode.c: Likewise. | ||
18 | |||
19 | Reported-by: Dima Krasner <dima@dimakrasner.com> | ||
20 | Acked-by: Mike Frysinger <vapier@gentoo.org> | ||
21 | --- | ||
22 | mknod.c | 1 + | ||
23 | printmode.c | 1 + | ||
24 | 2 files changed, 2 insertions(+) | ||
25 | |||
26 | diff --git a/mknod.c b/mknod.c | ||
27 | index 07e9a45..1463232 100644 | ||
28 | --- a/mknod.c | ||
29 | +++ b/mknod.c | ||
30 | @@ -1,6 +1,7 @@ | ||
31 | #include "defs.h" | ||
32 | |||
33 | #include <fcntl.h> | ||
34 | +#include <sys/stat.h> | ||
35 | |||
36 | #ifdef MAJOR_IN_SYSMACROS | ||
37 | # include <sys/sysmacros.h> | ||
38 | diff --git a/printmode.c b/printmode.c | ||
39 | index 4df1b9f..a721936 100644 | ||
40 | --- a/printmode.c | ||
41 | +++ b/printmode.c | ||
42 | @@ -1,6 +1,7 @@ | ||
43 | #include "defs.h" | ||
44 | |||
45 | #include <fcntl.h> | ||
46 | +#include <sys/stat.h> | ||
47 | |||
48 | #include "xlat/modetypes.h" | ||
49 | |||
50 | -- | ||
51 | 1.9.1 | ||
52 | |||
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 \ | |||
10 | file://strace-add-configure-options.patch \ | 10 | file://strace-add-configure-options.patch \ |
11 | file://Makefile-ptest.patch \ | 11 | file://Makefile-ptest.patch \ |
12 | file://run-ptest \ | 12 | file://run-ptest \ |
13 | file://Include-sys-stat.h-for-S_I-macros.patch \ | ||
14 | file://Include-linux-ioctl.h-for-_IOC_-macros.patch \ | ||
13 | " | 15 | " |
14 | 16 | ||
15 | SRC_URI[md5sum] = "107a5be455493861189e9b57a3a51912" | 17 | SRC_URI[md5sum] = "107a5be455493861189e9b57a3a51912" |