diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-02-16 21:14:10 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-18 07:39:30 +0000 |
commit | 0b1c3240ad1c1880740e68312b28f5e83915bd44 (patch) | |
tree | 8c9549e3fe936b442eeb95f46dcffbea08c7b478 /meta/recipes-connectivity | |
parent | 04c6a4850a60ab6ed94cf75331b0f837b4040feb (diff) | |
download | poky-0b1c3240ad1c1880740e68312b28f5e83915bd44.tar.gz |
socat: Fix build with musl
NETDB_INTERNAL is a glibc define
(From OE-Core rev: eb513884519804b3b8d600eeb7aadf3ec54e0345)
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/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch | 32 | ||||
-rw-r--r-- | meta/recipes-connectivity/socat/socat_1.7.3.1.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch b/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch new file mode 100644 index 0000000000..4bbd36766d --- /dev/null +++ b/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From e6a7d96fa3675bdd3f4d7a3d7682381789eef22f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 15 Feb 2016 20:25:34 +0000 | ||
4 | Subject: [PATCH] define NETDB_INTERNAL to -1 if not available | ||
5 | |||
6 | helps build with musl | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: Pending | ||
11 | |||
12 | compat.h | 4 ++++ | ||
13 | 1 file changed, 4 insertions(+) | ||
14 | |||
15 | diff --git a/compat.h b/compat.h | ||
16 | index c8bee4d..bfb013a 100644 | ||
17 | --- a/compat.h | ||
18 | +++ b/compat.h | ||
19 | @@ -666,6 +666,10 @@ typedef int sig_atomic_t; | ||
20 | # define NETDB_INTERNAL h_NETDB_INTERNAL | ||
21 | #endif | ||
22 | |||
23 | +#if !defined(NETDB_INTERNAL) | ||
24 | +# define NETDB_INTERNAL (-1) | ||
25 | +#endif | ||
26 | + | ||
27 | #ifndef INET_ADDRSTRLEN | ||
28 | # define INET_ADDRSTRLEN sizeof(struct sockaddr_in) | ||
29 | #endif | ||
30 | -- | ||
31 | 2.7.1 | ||
32 | |||
diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.1.bb b/meta/recipes-connectivity/socat/socat_1.7.3.1.bb index c215e04192..b9a8a2fd15 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.3.1.bb +++ b/meta/recipes-connectivity/socat/socat_1.7.3.1.bb | |||
@@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
14 | 14 | ||
15 | SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ | 15 | SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ |
16 | file://Makefile.in-fix-for-parallel-build.patch \ | 16 | file://Makefile.in-fix-for-parallel-build.patch \ |
17 | file://0001-define-NETDB_INTERNAL-to-1-if-not-available.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | SRC_URI[md5sum] = "334e46924f2b386299c9db2ac22bcd36" | 20 | SRC_URI[md5sum] = "334e46924f2b386299c9db2ac22bcd36" |