summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-03-01 09:13:44 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-05 13:14:51 +0000
commit508480782812a99d2cbfff4e9c4ceb5edf649662 (patch)
tree6c62a1b25828ac0532cdad9b430dbe8261d5edc6 /meta/recipes-connectivity
parentb24ef37460f230dba3dec646a9eabc82a56f0821 (diff)
downloadpoky-508480782812a99d2cbfff4e9c4ceb5edf649662.tar.gz
iproute2: Fix build failure on ppc
Latest version bump started failing for ppc32 attached patch is a backport from 3.9-rc1 (From OE-Core rev: 08be60d903ee97859295387b3418d5db85ab16e1) 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/iproute2/iproute2/0001-Fix-compilation-error-of-m_ipt.c-with-Werror-enabled.patch46
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_3.8.0.bb6
2 files changed, 50 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-Fix-compilation-error-of-m_ipt.c-with-Werror-enabled.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-Fix-compilation-error-of-m_ipt.c-with-Werror-enabled.patch
new file mode 100644
index 0000000000..db74963e48
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-Fix-compilation-error-of-m_ipt.c-with-Werror-enabled.patch
@@ -0,0 +1,46 @@
1Upstream-Status: Backport
2
3From 9235195666af7d887771cf557ef2bd3f00b9ecc8 Mon Sep 17 00:00:00 2001
4From: Vijay Subramanian <subramanian.vijay@gmail.com>
5Date: Tue, 26 Feb 2013 09:12:07 +0000
6Subject: [PATCH] Fix compilation error of m_ipt.c with -Werror enabled
7
8Commit (5a650703d47e10aa386406c855eff5a593b2120b Makefile: make warnings into
9errors ) causes the following build error.
10
11gcc -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
12-Wmissing-declarations -Wold-style-definition -O2 -I../include
13-DRESOLVE_HOSTNAMES -DLIBDIR=\"/usr/lib\" -DCONFDIR=\"/etc/iproute2\"
14-D_GNU_SOURCE -DCONFIG_GACT -DCONFIG_GACT_PROB -DIPT_LIB_DIR=\"/lib/xtables\"
15-DYY_NO_INPUT -c -o m_ipt.o m_ipt.c
16cc1: warnings being treated as errors
17m_ipt.c:72: error: no previous prototype for 'xtables_register_target'
18m_ipt.c:361: error: no previous prototype for 'build_st'
19make[1]: *** [m_ipt.o] Error 1
20
21This is fixed by adding the prototype in the header include/iptables.h
22
23I am not sure if this is due to something wrong on my build system but I am
24using current glibc 2.17.
25
26Signed-off-by: Vijay Subramanian <subramanian.vijay@gmail.com>
27---
28 include/iptables.h | 2 ++
29 1 file changed, 2 insertions(+)
30
31diff --git a/include/iptables.h b/include/iptables.h
32index dd844c1..f1e62e2 100644
33--- a/include/iptables.h
34+++ b/include/iptables.h
35@@ -143,6 +143,8 @@ extern int line;
36 /* Your shared library should call one of these. */
37 extern void register_match(struct iptables_match *me);
38 extern void register_target(struct iptables_target *me);
39+extern void xtables_register_target(struct iptables_target *me);
40+extern int build_st(struct iptables_target *target, struct ipt_entry_target *t);
41
42 extern struct in_addr *dotted_to_addr(const char *dotted);
43 extern char *addr_to_dotted(const struct in_addr *addrp);
44--
451.7.9.5
46
diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.8.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.8.0.bb
index 70dcd2dc43..892d230062 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_3.8.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_3.8.0.bb
@@ -1,9 +1,11 @@
1require iproute2.inc 1require iproute2.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \ 5SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \
6 file://configure-cross.patch" 6 file://configure-cross.patch \
7 file://0001-Fix-compilation-error-of-m_ipt.c-with-Werror-enabled.patch \
8 "
7 9
8SRC_URI[md5sum] = "951622fd770428116dc165acba375414" 10SRC_URI[md5sum] = "951622fd770428116dc165acba375414"
9SRC_URI[sha256sum] = "579145749f1aaf60e7c7a5de24b7f00fa2200a961094733c792b4ff139181e4f" 11SRC_URI[sha256sum] = "579145749f1aaf60e7c7a5de24b7f00fa2200a961094733c792b4ff139181e4f"