CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

zeroconf: Fix build with musl

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
(cherry picked from commit 48bce13c9b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj 2017-07-19 08:41:32 -07:00 committed by Armin Kuster
parent 18ddc5ce63
commit ad50bde574
2 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch Normal file
View File

@ -0,0 +1,69 @@
From 549773fdaf1fb003b84f25df386a07d299cdeb3e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 18 Jul 2017 21:25:33 -0700
Subject: [PATCH] zeroconf: Rename arp_op to avoid namespace conflicts with C
library
on musl e.g. we get
In file included from /mnt/a/oe/build/tmp/work/corei7-64-bec-linux-musl/zeroconf/0.9-r1/recipe-sysroot/usr/include/net/ethernet.h:10:0,
This is because in musl arp_op is a define which is included
and causes the conflict
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
zeroconf.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/zeroconf.c b/zeroconf.c
index 812d34b..f27e907 100644
--- a/zeroconf.c
+++ b/zeroconf.c
@@ -14,8 +14,6 @@
#include <sys/types.h>
#include <sys/socket.h>
-#include <linux/rtnetlink.h>
-#include <linux/if.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -34,6 +32,8 @@
#include <sys/time.h>
#include <signal.h>
#include <limits.h>
+#include <linux/rtnetlink.h>
+#include <linux/if.h>
#include "delay.h"
@@ -108,7 +108,7 @@ int arp_conflict(struct intf *intf, struct arp_packet *pkt);
void arp_packet_dump(struct arp_packet *pkt);
void arp_packet_send(int as,
struct intf *intf,
- short int arp_op,
+ short int arpop,
int null_sender);
void arp_probe(int as, struct intf *intf);
void arp_claim(int as, struct intf *intf);
@@ -1591,7 +1591,7 @@ int arp_conflict(struct intf *intf, struct arp_packet *pkt)
void arp_packet_send(int as,
struct intf *intf,
- short int arp_op,
+ short int arpop,
int null_sender)
{
@@ -1605,7 +1605,7 @@ void arp_packet_send(int as,
ap.arp.ar_pro = htons(ARP_IP_PROTO);
ap.arp.ar_hln = ETH_ALEN;
ap.arp.ar_pln = 4; /* octets in IPv4 address */
- ap.arp.ar_op = htons(arp_op);
+ ap.arp.ar_op = htons(arpop);
/* filling with 0xff sets the destination to
* the broadcast link-layer address for free
--
2.13.3

4
meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb
View File

@ -20,7 +20,9 @@ SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${BPN}-${PV}.tar.g
file://compilefix.patch \
file://makefile-add-ldflags.patch \
file://zeroconf-default \
file://debian-zeroconf"
file://debian-zeroconf \
file://0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch \
"
SRC_URI[md5sum] = "bdafb16b008ebb5633e4e581f77821d2"
SRC_URI[sha256sum] = "a8c74df127753e2310fa1e072f3c9ca44a404bb0bbce9cfec7a84c6dff8bec7b"