diff options
| author | Jörg Krause <joerg.krause@embedded.rocks> | 2016-05-20 07:15:48 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-05-24 20:50:06 +0200 |
| commit | 953a85439cb39345676cdce234de070475344783 (patch) | |
| tree | ed03a7cf1817d470b93f310581cb2a8fe846a576 | |
| parent | 1370fcaeb7c88e958a967594596769c71a4526f9 (diff) | |
| download | buildroot-953a85439cb39345676cdce234de070475344783.tar.gz buildroot-953a85439cb39345676cdce234de070475344783.zip | |
package/lxc: add patch to fix musl build
Add a patch to fix a build issue with the musl C library.
struct in6_addr is both defined in the C library header <netinet/in.h> and the
Linux kernel header <linux/in6.h>.
lxc_user_nic.c includes both <netinet/in.h> and <linux/if_bridge.h>. The later
one includes <linux/in6.h>.
This breaks build with the musl libc:
error: redefinition of ‘struct in6_addr’
As lxc_user_nic.c does not use any references from <linux/if_bridge.h> it is
safe to remove this header.
Fixes:
http://autobuild.buildroot.net/results/f32/f321823be6b477be7dc55393e563a3a61794265d/
http://autobuild.buildroot.net/results/8ab/8ab2dc8e0634fbfb582db94cdf94cee5712711f9/
http://autobuild.buildroot.net/results/e27/e27d637b1bb7278ae30d86a72a2d88432d805d2c/
.. and more.
Upstream status: Pending
https://github.com/lxc/lxc/pull/1029
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/lxc/0002-Fix-redefinition-of-struct-in6_addr.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/package/lxc/0002-Fix-redefinition-of-struct-in6_addr.patch b/package/lxc/0002-Fix-redefinition-of-struct-in6_addr.patch new file mode 100644 index 0000000000..b48ece38f6 --- /dev/null +++ b/package/lxc/0002-Fix-redefinition-of-struct-in6_addr.patch @@ -0,0 +1,43 @@ +From 245bba9aadf8e7aea487b6fbd851f86c75524552 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> +Date: Thu, 19 May 2016 21:51:27 +0200 +Subject: [PATCH] Fix redefinition of struct in6_addr +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +struct in6_addr is both defined in the C library header <netinet/in.h> +and the Linux kernel header <linux/in6.h>. + +lxc_user_nic.c includes both <netinet/in.h> and <linux/if_bridge.h>. The +later one includes <linux/in6.h>. + +This breaks build with the musl libc: + error: redefinition of ‘struct in6_addr’ + +As lxc_user_nic.c does not use any references from <linux/if_bridge.h> it +is safe to remove this header. + +Upstream status: Pending +https://github.com/lxc/lxc/pull/1029 + +Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> +--- + src/lxc/lxc_user_nic.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/lxc/lxc_user_nic.c b/src/lxc/lxc_user_nic.c +index 87780ca..0cb38ba 100644 +--- a/src/lxc/lxc_user_nic.c ++++ b/src/lxc/lxc_user_nic.c +@@ -41,7 +41,6 @@ + #include <net/if.h> + #include <net/if_arp.h> + #include <netinet/in.h> +-#include <linux/if_bridge.h> + #include <linux/netlink.h> + #include <linux/rtnetlink.h> + #include <linux/sockios.h> +-- +2.8.2 + |
