summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-08 08:56:23 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:29 +0000
commitc0976fc7257c7cb7fb2b024da882b601651905db (patch)
tree42ded3f886db3994061b156aa7d93f7196cbc216 /meta/recipes-connectivity
parenta3f9721399ea16756fdc38708a0a0cc748e37853 (diff)
downloadpoky-c0976fc7257c7cb7fb2b024da882b601651905db.tar.gz
irda-utils: Fix header inclusions
Helps compile with musl (From OE-Core rev: b16f41b43f1955331baf95ea17965332fe4556a2) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch29
-rw-r--r--meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch
new file mode 100644
index 0000000000..97eb975023
--- /dev/null
+++ b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch
@@ -0,0 +1,29 @@
1Replace use of <net/if_packet.h> with <linux/if_packet.h>.
2
3kernel headers <linux/if_packet.h> already provides the
4needed definitions, moreover not all libc implementations
5provide if_packet.h e.g. musl
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8Upstream-Status: Pending
9
10Index: irda-utils-0.9.18/irdaping/irdaping.c
11===================================================================
12--- irda-utils-0.9.18.orig/irdaping/irdaping.c
13+++ irda-utils-0.9.18/irdaping/irdaping.c
14@@ -33,7 +33,6 @@
15 #include <sys/socket.h>
16 #include <sys/ioctl.h>
17 #include <net/if.h> /* For struct ifreq */
18-#include <net/if_packet.h> /* For struct sockaddr_pkt */
19 #include <net/if_arp.h> /* For ARPHRD_IRDA */
20 #include <netinet/if_ether.h> /* For ETH_P_ALL */
21 #include <netinet/in.h> /* For htons */
22@@ -46,6 +45,7 @@
23 #include <asm/byteorder.h> /* __cpu_to_le32 and co. */
24
25 #include <linux/types.h> /* For __u8 and co. */
26+#include <linux/if_packet.h> /* For struct sockaddr_pkt */
27 #include <irda.h>
28
29 #ifndef AF_IRDA
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
index bd2f815cb3..11b2ee9117 100644
--- a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
+++ b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://irdadump/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \ 14SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
15 file://ldflags.patch \ 15 file://ldflags.patch \
16 file://musl.patch \
16 file://init" 17 file://init"
17 18
18SRC_URI[md5sum] = "84dc12aa4c3f61fccb8d8919bf4079bb" 19SRC_URI[md5sum] = "84dc12aa4c3f61fccb8d8919bf4079bb"