diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2018-12-02 08:15:26 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-12-02 08:16:10 +0100 |
| commit | 13c43455a05b036002e79808ca1c8e0d91d7871b (patch) | |
| tree | 147ddbfc5486085018bb527de1a43961fc8ee1ca /package/squid | |
| parent | 2e08c7398a47b414c288ea516514adac3edf00fb (diff) | |
| parent | 0393f5d34433e34e49ff7ce0fb998735453ed4fc (diff) | |
| download | buildroot-13c43455a05b036002e79808ca1c8e0d91d7871b.tar.gz buildroot-13c43455a05b036002e79808ca1c8e0d91d7871b.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/squid')
| -rw-r--r-- | package/squid/Config.in | 2 | ||||
| -rw-r--r-- | package/squid/squid.mk | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/package/squid/Config.in b/package/squid/Config.in index 50f65de433..726160b01d 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -1,10 +1,12 @@ 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_ATOMIC depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 config BR2_PACKAGE_SQUID bool "squid" + depends on BR2_TOOLCHAIN_HAS_ATOMIC 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 diff --git a/package/squid/squid.mk b/package/squid/squid.mk index d6f186d97b..5d5ec0c38d 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -39,13 +39,8 @@ SQUID_CONF_OPTS = \ --with-swapdir=/var/cache/squid/ \ --with-default-user=squid -# Atomics in Squid use __sync built-ins on 4 and 8 bytes. However, the -# configure script tests them using AC_TRY_RUN, so we have to give -# some hints. -ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4)$(BR2_TOOLCHAIN_HAS_SYNC_8),yy) -SQUID_CONF_ENV += squid_cv_gnu_atomics=yes -else -SQUID_CONF_ENV += squid_cv_gnu_atomics=no +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +SQUID_CONF_ENV += LIBS=-latomic endif ifeq ($(BR2_PACKAGE_LIBKRB5),y) |
