aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-04-18 11:44:07 -0700
committerKhem Raj <raj.khem@gmail.com>2019-04-27 10:13:07 -0700
commit29e17f9c0a88f610dd3ddfa34e9e92acf842272b (patch)
treeabbe99681e6fa25ad74754777e9ae915aab96096
parente85ac4aefc71f894035d6877385fa810d79b9188 (diff)
downloadmeta-openembedded-contrib-29e17f9c0a88f610dd3ddfa34e9e92acf842272b.tar.gz
squid: Link with libatomic on mips/ppc
The atomics are not supported as builtins on these arches Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-daemons/squid/squid_4.6.bb9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-networking/recipes-daemons/squid/squid_4.6.bb b/meta-networking/recipes-daemons/squid/squid_4.6.bb
index 56e4e0bab8a..ca4927dda1c 100644
--- a/meta-networking/recipes-daemons/squid/squid_4.6.bb
+++ b/meta-networking/recipes-daemons/squid/squid_4.6.bb
@@ -38,16 +38,15 @@ DEPENDS = "libtool krb5 openldap db cyrus-sasl"
inherit autotools pkgconfig useradd ptest perlnative
+LDFLAGS_append_mipsarch = " -latomic"
+LDFLAGS_append_powerpc = " -latomic"
+
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid"
-PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \
- ${@bb.utils.contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \
- ${@bb.utils.contains('TARGET_ARCH', 'mipsel', 'noatomics', '', d)} \
- ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
"
PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack"
-PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,,"
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking,"
PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2"