lede-packages-rs

commit 572fd1e40b8901279fb1357a837109ee9869c727
parent 1696390af8da8b49eaa3aacb69a5bf5c350e5460
Author: Jo-Philipp Wich <jow@openwrt.org>
Date:   Sat, 27 Jun 2015 13:30:05 +0200

Merge pull request #1439 from mstorchak/iodine

iodine: fix musl compatibility
Diffstat:
M
net/iodine/Makefile
 | 
2
+-
A
net/iodine/patches/100-musl-compatibility.patch
 | 
26
++++++++++++++++++++++++++

2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/net/iodine/Makefile b/net/iodine/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iodine
 PKG_VERSION:=0.7.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://code.kryo.se/iodine/
diff --git a/net/iodine/patches/100-musl-compatibility.patch b/net/iodine/patches/100-musl-compatibility.patch
@@ -0,0 +1,26 @@
+commit 9603c1848ddd4d9bb2d6ab031fcef91f543b71a0
+Author: Maxim Storchak <m.storchak@gmail.com>
+Date:   Thu Jun 25 19:38:24 2015 +0300
+
+    Fix compatibility with musl for OpenWRT
+
+    This patch breaks builds for Windows and Android, but since the only
+    libc flavors OpenWRT currently cares about are musl, uClibc and glibc,
+    this should be fine.
+
+    The reason for such brutal intrusiuon is explained in musl FAQ:
+    http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_there_no_MUSL_macro_.3F
+
+diff --git a/src/common.c b/src/common.c
+index 2715979..5f0e370 100644
+--- a/src/common.c
++++ b/src/common.c
+@@ -57,7 +57,7 @@
+ const unsigned char raw_header[RAW_HDR_LEN] = { 0x10, 0xd1, 0x9e, 0x00 };
+ 
+ /* daemon(3) exists only in 4.4BSD or later, and in GNU libc */
+-#if !defined(ANDROID) && !defined(WINDOWS32) && !(defined(BSD) && (BSD >= 199306)) && !defined(__GLIBC__)
++#ifdef __UCLIBC__
+ static int daemon(int nochdir, int noclose)
+ {
+  	int fd, i;