summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch')
-rw-r--r--meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch69
1 files changed, 0 insertions, 69 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
deleted file mode 100644
index d9346a8b71..0000000000
--- a/meta/recipes-devtools/strace/strace/Include-linux-ioctl.h-for-_IOC_-macros.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1Upstream-Status: Backport
2
3 http://sourceforge.net/p/strace/code/ci/3460dc486d333231998de0f19918204aacee9ae3
4
5Expected to be released officially as part of strace 4.11
6
7Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
8
9From 3460dc486d333231998de0f19918204aacee9ae3 Mon Sep 17 00:00:00 2001
10From: Felix Janda <felix.janda@posteo.de>
11Date: Sat, 28 Mar 2015 18:40:13 +0100
12Subject: [PATCH] Include <linux/ioctl.h> for _IOC_* macros
13
14Fix 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
20Reported-by: Dima Krasner <dima@dimakrasner.com>
21Acked-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
28diff --git a/evdev.c b/evdev.c
29index 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"
41diff --git a/ioctl.c b/ioctl.c
42index 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
54diff --git a/ioctlsort.c b/ioctlsort.c
55index 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--
681.9.1
69