summaryrefslogtreecommitdiffstats
path: root/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-02-27 15:26:47 +0000
committerAndrei Gherzan <andrei@gherzan.ro>2016-02-28 12:48:20 +0100
commit37e49134386a77e21bd08077f83aa3ecdf578567 (patch)
treea47f8ce3c0e1edc98531167b34be6ec899765b09 /recipes-devtools
parentc65b0b8c3ff4e06febaf9c104d191fcc6dd816eb (diff)
downloadmeta-raspberrypi-37e49134386a77e21bd08077f83aa3ecdf578567.tar.gz
wiringPi: Fix build with musl
Include asm/ioctl.h for _IOC_SIZEBITS Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools')
-rw-r--r--recipes-devtools/wiringPi/wiringpi/0001-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch58
-rw-r--r--recipes-devtools/wiringPi/wiringpi_git.bb8
2 files changed, 62 insertions, 4 deletions
diff --git a/recipes-devtools/wiringPi/wiringpi/0001-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch b/recipes-devtools/wiringPi/wiringpi/0001-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
new file mode 100644
index 0000000..5de5853
--- /dev/null
+++ b/recipes-devtools/wiringPi/wiringpi/0001-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
@@ -0,0 +1,58 @@
1From 7f65eb37a82a6d9b095d9c8f262ad9dd205acd03 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Jan 2016 16:57:38 -0800
4Subject: [PATCH] include <asm/ioctl.h> directly for _IOC_SIZEBITS
5
6Fixes errors like
7| wiringPiSPI.c: In function 'wiringPiSPIDataRW':
8| wiringPiSPI.c:89:35: error: '_IOC_SIZEBITS' undeclared (first use in
9this function)
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13Upstream-Status: Submitted
14
15 wiringPi/wiringPi.c | 1 +
16 wiringPi/wiringPiI2C.c | 1 +
17 wiringPi/wiringPiSPI.c | 1 +
18 3 files changed, 3 insertions(+)
19
20diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
21index 32e5100..cb5db9d 100644
22--- a/wiringPi/wiringPi.c
23+++ b/wiringPi/wiringPi.c
24@@ -64,6 +64,7 @@
25 #include <time.h>
26 #include <fcntl.h>
27 #include <pthread.h>
28+#include <asm/ioctl.h>
29 #include <sys/time.h>
30 #include <sys/mman.h>
31 #include <sys/stat.h>
32diff --git a/wiringPi/wiringPiI2C.c b/wiringPi/wiringPiI2C.c
33index c787bce..efdf53c 100644
34--- a/wiringPi/wiringPiI2C.c
35+++ b/wiringPi/wiringPiI2C.c
36@@ -52,6 +52,7 @@
37 #include <string.h>
38 #include <fcntl.h>
39 #include <sys/ioctl.h>
40+#include <asm/ioctl.h>
41
42 #include "wiringPi.h"
43 #include "wiringPiI2C.h"
44diff --git a/wiringPi/wiringPiSPI.c b/wiringPi/wiringPiSPI.c
45index 453df31..ae3c7d9 100644
46--- a/wiringPi/wiringPiSPI.c
47+++ b/wiringPi/wiringPiSPI.c
48@@ -27,6 +27,7 @@
49 #include <fcntl.h>
50 #include <errno.h>
51 #include <string.h>
52+#include <asm/ioctl.h>
53 #include <sys/ioctl.h>
54 #include <linux/spi/spidev.h>
55
56--
572.7.0
58
diff --git a/recipes-devtools/wiringPi/wiringpi_git.bb b/recipes-devtools/wiringPi/wiringpi_git.bb
index 4254a0a..9d2206b 100644
--- a/recipes-devtools/wiringPi/wiringpi_git.bb
+++ b/recipes-devtools/wiringPi/wiringpi_git.bb
@@ -9,10 +9,10 @@ SRCREV = "d79506694d7ba1c3da865d095238289d6175057d"
9 9
10S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
11 11
12SRC_URI = "\ 12SRC_URI = "git://git.drogon.net/wiringPi \
13 git://git.drogon.net/wiringPi \ 13 file://0001-Add-initial-cross-compile-support.patch \
14 file://0001-Add-initial-cross-compile-support.patch \ 14 file://0001-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch \
15 " 15 "
16 16
17COMPATIBLE_MACHINE = "raspberrypi" 17COMPATIBLE_MACHINE = "raspberrypi"
18 18