nodogsplash: fix musl compatiblity
- Replace nonstandard `sys/unistd.h` includes with `unistd.h` ones - Add missing `fcntl.h` include to `libhttpd/protocol.c` in order to provide declarations for `open()`, `O_RDONLY` etc. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
parent
fdd1fbf6e1
commit
d6715b0be2
2 changed files with 45 additions and 2 deletions
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Copyright (C) 2013 OpenWrt.org
|
# Copyright (C) 2013-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.
|
||||||
|
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||||
PKG_NAME:=nodogsplash
|
PKG_NAME:=nodogsplash
|
||||||
PKG_FIXUP:=autoreconf
|
PKG_FIXUP:=autoreconf
|
||||||
PKG_VERSION:=0.9_beta9.9.9
|
PKG_VERSION:=0.9_beta9.9.9
|
||||||
PKG_RELEASE:=5
|
PKG_RELEASE:=6
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
|
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
|
|
43
nodogsplash/patches/100-musl-compat.patch
Normal file
43
nodogsplash/patches/100-musl-compat.patch
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
--- a/src/client_list.c
|
||||||
|
+++ b/src/client_list.c
|
||||||
|
@@ -36,7 +36,7 @@
|
||||||
|
#include <pthread.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
-#include <sys/unistd.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
--- a/src/firewall.c
|
||||||
|
+++ b/src/firewall.c
|
||||||
|
@@ -37,7 +37,7 @@
|
||||||
|
#include <pthread.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
-#include <sys/unistd.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
--- a/src/util.c
|
||||||
|
+++ b/src/util.c
|
||||||
|
@@ -38,7 +38,7 @@
|
||||||
|
#include <pthread.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
-#include <sys/unistd.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
--- a/libhttpd/protocol.c
|
||||||
|
+++ b/libhttpd/protocol.c
|
||||||
|
@@ -25,6 +25,7 @@
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <time.h>
|
||||||
|
+#include <fcntl.h>
|
||||||
|
|
||||||
|
#if defined(_WIN32)
|
||||||
|
#else
|
Loading…
Reference in a new issue