summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/socat
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-18 21:05:11 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-21 12:56:33 +0100
commit7c64bbcf70af1245362c53c1c947e2d82f525d82 (patch)
treea4e26da26a55f8ed181e2a02a797e85fc6b89993 /meta/recipes-connectivity/socat
parentbef89e6a8bc7a83ef9e1ccca2fa86a6fca376749 (diff)
downloadpoky-7c64bbcf70af1245362c53c1c947e2d82f525d82.tar.gz
socat: Remove workaround for musl issue now fixed upstream
(From OE-Core rev: f9c6556ade1dc4e03aa83e86402f77c9eef662e7) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/socat')
-rw-r--r--meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch32
-rw-r--r--meta/recipes-connectivity/socat/socat_1.7.3.3.bb1
2 files changed, 0 insertions, 33 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
deleted file mode 100644
index 4bbd36766d..0000000000
--- a/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From e6a7d96fa3675bdd3f4d7a3d7682381789eef22f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 15 Feb 2016 20:25:34 +0000
4Subject: [PATCH] define NETDB_INTERNAL to -1 if not available
5
6helps build with musl
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending
11
12 compat.h | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/compat.h b/compat.h
16index 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--
312.7.1
32
diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.3.bb b/meta/recipes-connectivity/socat/socat_1.7.3.3.bb
index 7a889a3801..067f7c6444 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.3.3.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.3.3.bb
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12 file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f" 12 file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f"
13 13
14SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ 14SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
15 file://0001-define-NETDB_INTERNAL-to-1-if-not-available.patch \
16" 15"
17 16
18SRC_URI[md5sum] = "b2a032a47b8b89a18485697fa975154f" 17SRC_URI[md5sum] = "b2a032a47b8b89a18485697fa975154f"