openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-22 03:54:34 +04:00
Code Issues Packages Projects Releases Wiki Activity

socat: fix musl compatibility

Browse Source 
Do not include netinet/if_ether.h for musl to prevent struct ethhdr
redeclarations.

Also define NETDB_INTERNAL if needed to fix compilation of the network
backends.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich
2015-06-16 14:55:56 +02:00
parent 4116e327af
commit a0968faedb
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/socat/Makefile
View File

@@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2014 OpenWrt.org # Copyright (C) 2006-2015 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=socat PKG_NAME:=socat
PKG_VERSION:=1.7.3.0 PKG_VERSION:=1.7.3.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download

23
net/socat/patches/100-musl-compat.patch Normal file
View File

@@ -0,0 +1,23 @@
--- a/sysincludes.h
+++ b/sysincludes.h
@@ -79,6 +79,9 @@
#endif
#if HAVE_NETDB_H && (_WITH_IP4 || _WITH_IP6)
#include <netdb.h> /* struct hostent, gethostbyname() */
+#if !(__UCLIBC__ || __GLIBC__)
+#define NETDB_INTERNAL -1
+#endif
#endif
#if HAVE_SYS_UN_H && WITH_UNIX
#include <sys/un.h> /* struct sockaddr_un, unix domain sockets */
@@ -139,8 +142,10 @@
#include <netpacket/packet.h>
#endif
#if HAVE_NETINET_IF_ETHER_H
+#if defined(__UCLIBC__) || defined(__GLIBC__)
#include <netinet/if_ether.h>
#endif
+#endif
#if HAVE_LINUX_IF_TUN_H
#include <linux/if_tun.h>
#endif