Merge pull request #9425 from neheb/open

squid: Fix compilation with GCC9
This commit is contained in:
Rosen Penev 2019-07-09 09:49:02 -07:00 committed by GitHub
commit 3d75793840
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -9,10 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=squid PKG_NAME:=squid
PKG_VERSION:=4.6 PKG_VERSION:=4.6
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www3.us.squid-cache.org/Versions/v4/ \ 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/ http://www.squid-cache.org/Versions/v4/
PKG_HASH:=015bade5d3a4905142c4c605df5c4216471e3d8338079955e0e44b0ae0303d41 PKG_HASH:=015bade5d3a4905142c4c605df5c4216471e3d8338079955e0e44b0ae0303d41
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
PKG_LICENSE:=GPL-2.0-or-later
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
@ -117,6 +117,9 @@ CONFIGURE_VARS += \
ac_cv_header_linux_netfilter_ipv4_h=yes \ ac_cv_header_linux_netfilter_ipv4_h=yes \
ac_cv_epoll_works=yes ac_cv_epoll_works=yes
TARGET_CFLAGS += -Wno-error
TARGET_LDFLAGS += -latomic
define Build/Compile define Build/Compile
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lib all +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lib all
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \