[yocto] [meta-raspberrypi][PATCH 08/23] wiringPi: Fix build with musl

[Andrei Gherzan]

On Sat, Feb 27, 2016 at 03:26:47PM +0000, Khem Raj wrote:
> Include asm/ioctl.h for _IOC_SIZEBITS
>
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
>  ...de-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch | 58 ++++++++++++++++++++++
>  recipes-devtools/wiringPi/wiringpi_git.bb          |  8 +--
>  2 files changed, 62 insertions(+), 4 deletions(-)
>  create mode 100644 recipes-devtools/wiringPi/wiringpi/0001-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
>
> 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 @@
> +From 7f65eb37a82a6d9b095d9c8f262ad9dd205acd03 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem at gmail.com>
> +Date: Sat, 30 Jan 2016 16:57:38 -0800
> +Subject: [PATCH] include <asm/ioctl.h> directly for _IOC_SIZEBITS
> +
> +Fixes errors like
> +| wiringPiSPI.c: In function 'wiringPiSPIDataRW':
> +| wiringPiSPI.c:89:35: error: '_IOC_SIZEBITS' undeclared (first use in
> +this function)
> +
> +Signed-off-by: Khem Raj <raj.khem at gmail.com>
> +---
> +Upstream-Status: Submitted
> +
> + wiringPi/wiringPi.c    | 1 +
> + wiringPi/wiringPiI2C.c | 1 +
> + wiringPi/wiringPiSPI.c | 1 +
> + 3 files changed, 3 insertions(+)
> +
> +diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
> +index 32e5100..cb5db9d 100644
> +--- a/wiringPi/wiringPi.c
> ++++ b/wiringPi/wiringPi.c
> +@@ -64,6 +64,7 @@
> + #include <time.h>
> + #include <fcntl.h>
> + #include <pthread.h>
> ++#include <asm/ioctl.h>
> + #include <sys/time.h>
> + #include <sys/mman.h>
> + #include <sys/stat.h>
> +diff --git a/wiringPi/wiringPiI2C.c b/wiringPi/wiringPiI2C.c
> +index c787bce..efdf53c 100644
> +--- a/wiringPi/wiringPiI2C.c
> ++++ b/wiringPi/wiringPiI2C.c
> +@@ -52,6 +52,7 @@
> + #include <string.h>
> + #include <fcntl.h>
> + #include <sys/ioctl.h>
> ++#include <asm/ioctl.h>
> +
> + #include "wiringPi.h"
> + #include "wiringPiI2C.h"
> +diff --git a/wiringPi/wiringPiSPI.c b/wiringPi/wiringPiSPI.c
> +index 453df31..ae3c7d9 100644
> +--- a/wiringPi/wiringPiSPI.c
> ++++ b/wiringPi/wiringPiSPI.c
> +@@ -27,6 +27,7 @@
> + #include <fcntl.h>
> + #include <errno.h>
> + #include <string.h>
> ++#include <asm/ioctl.h>
> + #include <sys/ioctl.h>
> + #include <linux/spi/spidev.h>
> +
> +--
> +2.7.0
> +
> 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"
>
>  S = "${WORKDIR}/git"
>
> -SRC_URI = "\
> -          git://git.drogon.net/wiringPi \
> -          file://0001-Add-initial-cross-compile-support.patch \
> -          "
> +SRC_URI = "git://git.drogon.net/wiringPi \
> +           file://0001-Add-initial-cross-compile-support.patch \
> +           file://0001-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch \
> +           "
>
>  COMPATIBLE_MACHINE = "raspberrypi"
>

Hi Raj! Merged to master. Thank you.

--
Andrei Gherzan