From e5968727f3c0ea78f4f0525847ad11cf68f5d01c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 4 Jul 2017 00:01:03 +0200 Subject: net-tools: remove libintl static linking handling We no longer support building the full-blown libintl in static linking scenarios, as it causes too many problems. Patch 0001-Makefile-fix-static-linking-issue-with-lintl.patch was added to allow passing -lintl through LIBS, in a place that works for static linking. However, for dynamic linking, we can simply pass -lintl through the existing LDFLAGS variable, as it was done prior to commit 38bfd129c64a9cfd82c4fa4c797afadf12a6ffaa ("package/net-tools: fix static linking issue with lintl"). This commit does that and gets rid of the now useless patch. Signed-off-by: Thomas Petazzoni --- ...02-iptunnel.c-do-not-include-netinet-ip.h.patch | 72 ---------------------- 1 file changed, 72 deletions(-) delete mode 100644 package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch (limited to 'package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch') diff --git a/package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch b/package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch deleted file mode 100644 index a8658c4fec..0000000000 --- a/package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch +++ /dev/null @@ -1,72 +0,0 @@ -From eec38a200357b195efbb23bb645ab721c040f246 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Thu, 3 Nov 2016 12:59:39 +0000 -Subject: [PATCH] iptunnel.c: do not include netinet/ip.h - -This fixes a struct redefinition problem like this one: - -================================ -In file included from /usr/include/linux/if_tunnel.h:6:0, - from iptunnel.c:34: -/usr/include/linux/ip.h:85:8: error: redefinition of 'struct iphdr' - struct iphdr { - ^ -In file included from iptunnel.c:29:0: -/usr/include/netinet/ip.h:45:8: note: originally defined here - struct iphdr - ^ -================================ - -iptunnel.c includes netinet/ip.h which contains a definition of the -iphdr struct. - -iptunnel.c also includes linux/if_tunnel.h which includes linux/ip.h -which contains a definition of the iphdr struct. - -So, both netinet/ip.h and linux/ip.h define the iphdr struct, and both -of them have been included directly or indirectly by iptunnel.c. Because -of that the compilation fails due to a struct redefinition. - -The problem can be solved by just not including netinet/ip.h. - -However, some Linux headers included in certain toolchains may not have -an updated linux/if_tunnel.h which includes linux/ip.h, so we need to -include it unconditionally otherwise linux/if_tunnel.h will use the -struct iphdr before being defined and the compilation will also fail in -this way: - -================================ -In file included from iptunnel.c:33:0: -/usr/include/linux/if_tunnel.h:37:16: error: field 'iph' has incomplete type - struct iphdr iph; - ^ -================================ - -Upstream status: merge request sent -https://sourceforge.net/p/net-tools/code/merge-requests/4/ - -Signed-off-by: Vicente Olivert Riera ---- - iptunnel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/iptunnel.c b/iptunnel.c -index 3fe1b84..e2ec2d8 100644 ---- a/iptunnel.c -+++ b/iptunnel.c -@@ -26,11 +26,11 @@ - #include - #include - #include --#include - #include - #include - #include - #include -+#include - #include - - #include "config.h" --- -2.10.1 - -- cgit v1.2.3