package/squid: depends on current_exception
authorBernd Kuhls <bernd.kuhls@t-online.de>
Fri, 24 Aug 2018 20:01:07 +0000 (22:01 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Sat, 8 Sep 2018 21:39:04 +0000 (23:39 +0200)
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>
package/squid/Config.in

index c1eb25c6b9f7f1b847b758a8d73724210e523c0b..aeffbc657990678c12054e37d3f30921446e6916 100644 (file)
@@ -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