summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2018-10-16 14:37:36 +0300
committerPeter Korsgaard <peter@korsgaard.com>2018-10-16 14:45:37 +0200
commit7b30cfc8eef3eef3d50347ad191c6dd90c32e591 (patch)
tree116e0bdbec461d123b4f05350546ceb5aa24b24e
parentde24e47d90f64f546978b6ec12f769dc4fd89587 (diff)
downloadbuildroot-7b30cfc8eef3eef3d50347ad191c6dd90c32e591.tar.gz
buildroot-7b30cfc8eef3eef3d50347ad191c6dd90c32e591.zip
squid: requires C++11 toolchain
The squid changelog for version 4.0.1 mentions that "C++11 compiler support is now mandatory". The code uses the std::map::emplace method that gcc before 4.8 does not support. Also fixes: http://autobuild.buildroot.net/results/370/37093f8d3395850b2db5ed645f60d1c2df92768d/ http://autobuild.buildroot.net/results/921/92117726e7b4ede08dcc0e4fd1a85171fd17aeb8/ http://autobuild.buildroot.net/results/e67/e679ef90219c5e8f9c94ddcd7d3f9582f79ef751/ Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/squid/Config.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/package/squid/Config.in b/package/squid/Config.in
index aeffbc6579..50f65de433 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -1,12 +1,13 @@
-comment "squid needs a toolchain w/ C++ not affected by GCC bug 64735"
+comment "squid needs a toolchain w/ C++, gcc >= 4.8 not affected by bug 64735"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \
- !BR2_INSTALL_LIBSTDCPP
+ !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
config BR2_PACKAGE_SQUID
bool "squid"
depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
# needs fork()
depends on BR2_USE_MMU
select BR2_PACKAGE_LIBCAP
OpenPOWER on IntegriCloud