From 768f1a42ae47d526fc5a53c3ad7e779584e4cde9 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 25 Jun 2015 16:42:52 +0200 Subject: [PATCH] squid: fix musl compatibility Change `sys/signal.h` include to just `signal.h`. The build otherwise fails due to `-Werror` with the following message: In file included from rfcnb-io.c:43:0: .../staging_dir/toolchain-mipsel_mips32_gcc-4.8-linaro_musl-1.1.10/include/sys/signal.h:1:2: error: #warning redirecting incorrect #include to [-Werror=cpp] #warning redirecting incorrect #include to ^ cc1: all warnings being treated as errors Signed-off-by: Jo-Philipp Wich --- net/squid/Makefile | 2 +- net/squid/patches/200-musl-compat.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 net/squid/patches/200-musl-compat.patch diff --git a/net/squid/Makefile b/net/squid/Makefile index 1d34d26ca..d5873c7b2 100644 --- a/net/squid/Makefile +++ b/net/squid/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=squid PKG_VERSION:=3.5.2 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=Luka Perkov diff --git a/net/squid/patches/200-musl-compat.patch b/net/squid/patches/200-musl-compat.patch new file mode 100644 index 000000000..7cbd9da9f --- /dev/null +++ b/net/squid/patches/200-musl-compat.patch @@ -0,0 +1,15 @@ +--- a/lib/rfcnb/rfcnb-io.c ++++ b/lib/rfcnb/rfcnb-io.c +@@ -36,11 +36,11 @@ + #include "rfcnb/rfcnb-util.h" + #include "rfcnb/std-includes.h" + ++#include + #if HAVE_STRING_H + #include + #endif + #include +-#include + + int RFCNB_Timeout = 0; /* Timeout in seconds ... */ +