summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-12-14 00:15:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:26 +0000
commit6e3950b4505e052ada54776109061d001496b0b4 (patch)
treebd06da688e95f2ceb5af76ee80dcc46d4549b504 /meta
parent68f88a5a88f0e3ecc962fc1b03fec8e7fd98b7e8 (diff)
downloadpoky-6e3950b4505e052ada54776109061d001496b0b4.tar.gz
tcp-wrappers: Fix build with musl
(From OE-Core rev: 27459f5e4a9b86b0cd751f6ec3b92071e4316cc0) 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/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch31
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb4
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch
new file mode 100644
index 0000000000..eee640e8a8
--- /dev/null
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch
@@ -0,0 +1,31 @@
1__BEGIN_DECLS/__END_DECLS are BSD specific and not defined in musl
2glibc and uclibc had sys/cdefs.h doing it.
3
4Upstream-Status: Pending
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Index: tcp_wrappers_7.6/tcpd.h
8===================================================================
9--- tcp_wrappers_7.6.orig/tcpd.h
10+++ tcp_wrappers_7.6/tcpd.h
11@@ -11,7 +11,9 @@
12 #include <netinet/in.h>
13 #include <stdio.h>
14
15-__BEGIN_DECLS
16+#ifdef __cplusplus
17+extern "C" {
18+#endif
19
20 /* Structure to describe one communications endpoint. */
21
22@@ -252,6 +254,8 @@ extern char *fix_strtok();
23 extern char *my_strtok();
24 #endif
25
26-__END_DECLS
27+#ifdef __cplusplus
28+}
29+#endif
30
31 #endif
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
index 2630478284..5fdbbced72 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -43,6 +43,7 @@ SRC_URI = "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \
43 file://try-from.8 \ 43 file://try-from.8 \
44 file://safe_finger.8 \ 44 file://safe_finger.8 \
45 file://makefile-fix-parallel.patch \ 45 file://makefile-fix-parallel.patch \
46 file://musl-decls.patch \
46 " 47 "
47 48
48SRC_URI[md5sum] = "e6fa25f71226d090f34de3f6b122fb5a" 49SRC_URI[md5sum] = "e6fa25f71226d090f34de3f6b122fb5a"
@@ -73,6 +74,9 @@ EXTRA_OEMAKE = "'CC=${CC}' \
73 74
74EXTRA_OEMAKE_NETGROUP = "-DNETGROUP -DUSE_GETDOMAIN" 75EXTRA_OEMAKE_NETGROUP = "-DNETGROUP -DUSE_GETDOMAIN"
75EXTRA_OEMAKE_NETGROUP_libc-uclibc = "-DUSE_GETDOMAIN" 76EXTRA_OEMAKE_NETGROUP_libc-uclibc = "-DUSE_GETDOMAIN"
77EXTRA_OEMAKE_NETGROUP_libc-musl = "-DUSE_GETDOMAIN"
78
79EXTRA_OEMAKE_append_libc-musl = " 'LIBS='"
76 80
77do_compile () { 81do_compile () {
78 oe_runmake 'TABLES=-DHOSTS_DENY=\"${sysconfdir}/hosts.deny\" -DHOSTS_ALLOW=\"${sysconfdir}/hosts.allow\"' \ 82 oe_runmake 'TABLES=-DHOSTS_DENY=\"${sysconfdir}/hosts.deny\" -DHOSTS_ALLOW=\"${sysconfdir}/hosts.allow\"' \