summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-12-29 01:22:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:27 +0000
commit7b6b3124dbb8505fd59b066061dd272acf401247 (patch)
treec48a558d786b0253b8f2085fb8e4027759473183 /meta
parentee1bfdb4571bcad9b33c0fc5a6a99940c6e8bf41 (diff)
downloadpoky-7b6b3124dbb8505fd59b066061dd272acf401247.tar.gz
net-tools: Link with libintl on uclibc
libintl is needed explicitly on linker cmdline on uclibc since the APIs are not in libc itelf. Fix build on musl (From OE-Core rev: 1eaa3e101d04fd9e73b3c680f305b35f9bb16add) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/net-tools/net-tools/musl-fixes.patch100
-rw-r--r--meta/recipes-extended/net-tools/net-tools_1.60-26.bb4
2 files changed, 104 insertions, 0 deletions
diff --git a/meta/recipes-extended/net-tools/net-tools/musl-fixes.patch b/meta/recipes-extended/net-tools/net-tools/musl-fixes.patch
new file mode 100644
index 0000000000..f694d594bf
--- /dev/null
+++ b/meta/recipes-extended/net-tools/net-tools/musl-fixes.patch
@@ -0,0 +1,100 @@
1Adjust headers for non-glibc cases
2especially exposed by musl
3
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5Upstream-Status: Pending
6
7Index: net-tools-1.60/lib/inet6_gr.c
8===================================================================
9--- net-tools-1.60.orig/lib/inet6_gr.c
10+++ net-tools-1.60/lib/inet6_gr.c
11@@ -23,7 +23,7 @@
12 #include <string.h>
13 #include <stdio.h>
14 #include <unistd.h>
15-#ifndef __GLIBC__
16+#ifdef HAVE_IPV6_ROUTE_H
17 #include <netinet6/ipv6_route.h> /* glibc doesn't have this */
18 #endif
19 #include "version.h"
20Index: net-tools-1.60/lib/inet6_sr.c
21===================================================================
22--- net-tools-1.60.orig/lib/inet6_sr.c
23+++ net-tools-1.60/lib/inet6_sr.c
24@@ -23,10 +23,10 @@
25 #include <string.h>
26 #include <stdio.h>
27 #include <unistd.h>
28-#ifdef __GLIBC__
29-#include <net/route.h>
30-#else
31+#ifdef HAVE_IPV6_ROUTE_H
32 #include <netinet6/ipv6_route.h> /* glibc does not have this */
33+#else
34+#include <net/route.h>
35 #endif
36 #include "version.h"
37 #include "net-support.h"
38Index: net-tools-1.60/lib/inet_sr.c
39===================================================================
40--- net-tools-1.60.orig/lib/inet_sr.c
41+++ net-tools-1.60/lib/inet_sr.c
42@@ -26,6 +26,7 @@
43 #include <string.h>
44 #include <stdio.h>
45 #include <unistd.h>
46+#include <asm-generic/param.h>
47 #include "version.h"
48 #include "net-support.h"
49 #include "pathnames.h"
50Index: net-tools-1.60/lib/util-ank.c
51===================================================================
52--- net-tools-1.60.orig/lib/util-ank.c
53+++ net-tools-1.60/lib/util-ank.c
54@@ -14,6 +14,7 @@
55 * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
56 */
57
58+#include <limits.h>
59 #include <stdio.h>
60 #include <stdlib.h>
61 #include <unistd.h>
62Index: net-tools-1.60/mii-tool.c
63===================================================================
64--- net-tools-1.60.orig/mii-tool.c
65+++ net-tools-1.60/mii-tool.c
66@@ -47,10 +47,6 @@ static char Version[] = "$Id: mii-tool.c
67 #include <net/if.h>
68 #include <linux/sockios.h>
69
70-#ifndef __GLIBC__
71-#include <linux/if_arp.h>
72-#include <linux/if_ether.h>
73-#endif
74 #include "mii.h"
75 #include "version.h"
76
77Index: net-tools-1.60/netstat.c
78===================================================================
79--- net-tools-1.60.orig/netstat.c
80+++ net-tools-1.60/netstat.c
81@@ -87,6 +87,7 @@
82 #include <dirent.h>
83 #include <sys/stat.h>
84 #include <sys/types.h>
85+#include <asm-generic/param.h>
86
87 #include "net-support.h"
88 #include "pathnames.h"
89Index: net-tools-1.60/slattach.c
90===================================================================
91--- net-tools-1.60.orig/slattach.c
92+++ net-tools-1.60/slattach.c
93@@ -44,6 +44,7 @@
94 #include <string.h>
95 #include <unistd.h>
96 #include <getopt.h>
97+#include <termios.h>
98 #include <linux/if_slip.h>
99
100 #if defined(__GLIBC__)
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index 632aee7590..14b8e494bf 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -11,6 +11,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/
11 file://net-tools-config.h \ 11 file://net-tools-config.h \
12 file://net-tools-config.make \ 12 file://net-tools-config.make \
13 file://ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch \ 13 file://ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch \
14 file://musl-fixes.patch \
14 " 15 "
15 16
16# for this package we're mostly interested in tracking debian patches, 17# for this package we're mostly interested in tracking debian patches,
@@ -32,6 +33,9 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/net-tools/"
32inherit gettext 33inherit gettext
33 34
34do_patch[depends] = "quilt-native:do_populate_sysroot" 35do_patch[depends] = "quilt-native:do_populate_sysroot"
36
37LDFLAGS_append_libc-uclibc = " -lintl "
38
35# The Makefile is lame, no parallel build 39# The Makefile is lame, no parallel build
36PARALLEL_MAKE = "" 40PARALLEL_MAKE = ""
37 41