Patchwork iproute2: Fix build failure on ppc

login
register
mail settings
Submitter Khem Raj
Date March 1, 2013, 5:13 p.m.
Message ID <1362158024-4041-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/45373/
State Accepted
Commit 508480782812a99d2cbfff4e9c4ceb5edf649662
Headers show

Comments

Khem Raj - March 1, 2013, 5:13 p.m.
Latest version bump started failing for ppc32
attached patch is a backport from 3.9-rc1

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...tion-error-of-m_ipt.c-with-Werror-enabled.patch |   46 ++++++++++++++++++++
 .../iproute2/iproute2_3.8.0.bb                     |    6 ++-
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-Fix-compilation-error-of-m_ipt.c-with-Werror-enabled.patch

Patch

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 0000000..db74963
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-Fix-compilation-error-of-m_ipt.c-with-Werror-enabled.patch
@@ -0,0 +1,46 @@ 
+Upstream-Status: Backport
+
+From 9235195666af7d887771cf557ef2bd3f00b9ecc8 Mon Sep 17 00:00:00 2001
+From: Vijay Subramanian <subramanian.vijay@gmail.com>
+Date: Tue, 26 Feb 2013 09:12:07 +0000
+Subject: [PATCH] Fix compilation error of m_ipt.c with -Werror enabled
+
+Commit (5a650703d47e10aa386406c855eff5a593b2120b Makefile: make warnings into
+errors ) causes the following build error.
+
+gcc -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
+-Wmissing-declarations -Wold-style-definition -O2 -I../include
+-DRESOLVE_HOSTNAMES -DLIBDIR=\"/usr/lib\" -DCONFDIR=\"/etc/iproute2\"
+-D_GNU_SOURCE -DCONFIG_GACT -DCONFIG_GACT_PROB -DIPT_LIB_DIR=\"/lib/xtables\"
+-DYY_NO_INPUT   -c -o m_ipt.o m_ipt.c
+cc1: warnings being treated as errors
+m_ipt.c:72: error: no previous prototype for 'xtables_register_target'
+m_ipt.c:361: error: no previous prototype for 'build_st'
+make[1]: *** [m_ipt.o] Error 1
+
+This is fixed by adding the prototype in the header include/iptables.h
+
+I am not sure if this is due to something wrong on my build system but I am
+using current glibc 2.17.
+
+Signed-off-by: Vijay Subramanian <subramanian.vijay@gmail.com>
+---
+ include/iptables.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/iptables.h b/include/iptables.h
+index dd844c1..f1e62e2 100644
+--- a/include/iptables.h
++++ b/include/iptables.h
+@@ -143,6 +143,8 @@ extern int line;
+ /* Your shared library should call one of these. */
+ extern void register_match(struct iptables_match *me);
+ extern void register_target(struct iptables_target *me);
++extern void xtables_register_target(struct iptables_target *me);
++extern int build_st(struct iptables_target *target, struct ipt_entry_target *t);
+ 
+ extern struct in_addr *dotted_to_addr(const char *dotted);
+ extern char *addr_to_dotted(const struct in_addr *addrp);
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.8.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.8.0.bb
index 70dcd2d..892d230 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 @@ 
 require iproute2.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \
-           file://configure-cross.patch"
+           file://configure-cross.patch \
+           file://0001-Fix-compilation-error-of-m_ipt.c-with-Werror-enabled.patch \
+          "
 
 SRC_URI[md5sum] = "951622fd770428116dc165acba375414"
 SRC_URI[sha256sum] = "579145749f1aaf60e7c7a5de24b7f00fa2200a961094733c792b4ff139181e4f"