summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2018-08-24 22:01:07 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-09-08 23:39:04 +0200
commitc52e1475e2d7c4c179d01d95a5822d09c4ce6039 (patch)
treef2884ce898e8ab40bdb7ce997f51822bb68e5a1b
parent5d1964b9221990d088a9ff2f225834ccba34e47f (diff)
downloadbuildroot-c52e1475e2d7c4c179d01d95a5822d09c4ce6039.tar.gz
buildroot-c52e1475e2d7c4c179d01d95a5822d09c4ce6039.zip
package/squid: depends on current_exception
Fixes build error TextException.cc: In function 'std::ostream& CurrentException(std::ostream&)': TextException.cc:64:9: error: 'current_exception' is not a member of 'std' if (std::current_exception()) { using this defconfig BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/armv5-ctng-linux-gnueabi.tar.xz" BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="armv5-ctng-linux-gnueabi" BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_12=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y BR2_PACKAGE_GNUTLS=y BR2_PACKAGE_OPENSSL=y BR2_PACKAGE_LIBKRB5=y According to http://www.squid-cache.org/Versions/v4/RELEASENOTES.html#ss1.1 squid-4.2 depends on C++11, but adding -std=c++11 did not fix the build error. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Tested-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/squid/Config.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/package/squid/Config.in b/package/squid/Config.in
index c1eb25c6b9..aeffbc6579 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -1,10 +1,12 @@
-comment "squid needs a toolchain w/ C++"
+comment "squid needs a toolchain w/ C++ not affected by GCC bug 64735"
depends on BR2_USE_MMU
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \
+ !BR2_INSTALL_LIBSTDCPP
config BR2_PACKAGE_SQUID
bool "squid"
depends on BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception
# needs fork()
depends on BR2_USE_MMU
select BR2_PACKAGE_LIBCAP
OpenPOWER on IntegriCloud