Commit d2f7d0d7 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

squid: fix old distro gcc build failure 

Squid 3.5.x deprecated the use of HOSTCXX & friends in favour of
BUILDCXX and BUILDCXXFLAGS.
When they are not specified BUILDCXXFLAGS takes flags from target
CXXFLAGS which specifies C11 standard and which older vesions of gcc
don't understand, thus causing breakage.
cf_gen hasn't got any C11 features so it's not required. Fixes:
http://autobuild.buildroot.net/results/816/8162e4ec941e7642248373be47cca99113a648e8/



Also drop ACLOCAL and AUTOMAKE trickery from e27ccbab since it's no
longer required.

And fix a typo in the hash file pointing to an improper hash file
upstream.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 2c60ccf7

package/squid/squid.hash

+1 −1
Original line number Diff line number Diff line 
# From http://www.squid-cache.org/Versions/v3/3.4/squid-3.5.1.tar.xz.asc

# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.1.tar.xz.asc

md5	b3c9d9726314c1136b7a4c06447db24b	squid-3.5.1.tar.xz

sha1	a2b01afd33d1df3a234e1a5c3405d626f6cf0fb0	squid-3.5.1.tar.xz

package/squid/squid.mk

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ SQUID_CONF_ENV = \ 
	ac_cv_func___va_copy=yes \

	ac_cv_func_strnstr=no \

	ac_cv_have_squid=yes \

	ACLOCAL="$(ACLOCAL)" \

	AUTOMAKE="$(AUTOMAKE)"

	BUILXCXX="$(HOSTCXX)" \

	BUILDCXXFLAGS="$(HOST_CXXFLAGS)"

SQUID_CONF_OPTS = \

	--enable-async-io=8 \

	--enable-linux-netfilter \