ec1cbd8ea7
Fix two build issue when socat is build with musl: - Set NETDB_INTERNAL locally since it's not provided by musl - remove if_tun.h kernel header Fixes: http://autobuild.buildroot.net/results/029/02977d3844ef62b1e9cbfbab244593632757c5e2 Signed-off-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From e7804d1750652e39c7a5803d360b29b2637a695f Mon Sep 17 00:00:00 2001
|
|
From: Romain Naour <romain.naour@gmail.com>
|
|
Date: Sun, 28 Aug 2016 21:04:01 +0200
|
|
Subject: [PATCH] compat: set NETDB_INTERNAL
|
|
|
|
Musl doesn't provide NETDB_INTERNAL which is defined in resolv/netdb.h
|
|
in Glibc [1].
|
|
|
|
Set NETDB_INTERNAL to -1 locally if not already defined.
|
|
Based on [2].
|
|
|
|
[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/netdb.h;h=3aba530932c7a62a4f23e3193e9186da677f552b;hb=fdfc9260b61d3d72541f18104d24c7bcb0ce5ca2#l74
|
|
[2] http://git.alpinelinux.org/cgit/aports/tree/main/socat/netdb-internal.patch?id=5a45173b50892cb634197c30b3506ebff98d3b7d
|
|
|
|
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
---
|
|
compat.h | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/compat.h b/compat.h
|
|
index 19a929f..4f5ee6d 100644
|
|
--- a/compat.h
|
|
+++ b/compat.h
|
|
@@ -666,6 +666,8 @@ typedef int sig_atomic_t;
|
|
|
|
#if !defined(NETDB_INTERNAL) && defined(h_NETDB_INTERNAL)
|
|
# define NETDB_INTERNAL h_NETDB_INTERNAL
|
|
+#elif !defined(NETDB_INTERNAL)
|
|
+# define NETDB_INTERNAL (-1)
|
|
#endif
|
|
|
|
#ifndef INET_ADDRSTRLEN
|
|
--
|
|
2.5.5
|
|
|