From c9323ef7f5b1a41db0e034490f826c0aefc428db Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 7 Jul 2019 13:27:25 -0700 Subject: [PATCH] squid: Fix compilation with GCC9 by passing -Werror. Also added -latomic as some platforms need it. Signed-off-by: Rosen Penev (cherry-picked from c18cb9e7c57a1806017a473c2a076c2a5d9aabee) --- net/squid/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net/squid/Makefile b/net/squid/Makefile index 008ad4b3b6..21ca810ca3 100644 --- a/net/squid/Makefile +++ b/net/squid/Makefile @@ -9,10 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=squid PKG_VERSION:=4.6 -PKG_RELEASE:=1 - -PKG_LICENSE:=GPL-2.0 -PKG_MAINTAINER:=Marko Ratkaj +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www3.us.squid-cache.org/Versions/v4/ \ @@ -20,6 +17,9 @@ PKG_SOURCE_URL:=http://www3.us.squid-cache.org/Versions/v4/ \ http://www.squid-cache.org/Versions/v4/ PKG_HASH:=015bade5d3a4905142c4c605df5c4216471e3d8338079955e0e44b0ae0303d41 +PKG_MAINTAINER:=Marko Ratkaj +PKG_LICENSE:=GPL-2.0-or-later + PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 PKG_FIXUP:=autoreconf @@ -117,6 +117,9 @@ CONFIGURE_VARS += \ ac_cv_header_linux_netfilter_ipv4_h=yes \ ac_cv_epoll_works=yes +TARGET_CFLAGS += -Wno-error +TARGET_LDFLAGS += -latomic + define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lib all +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ -- 2.30.2