diff options
-rw-r--r-- | meta-networking/recipes-daemons/squid/squid_4.6.bb | 9 |
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 56e4e0bab8..ca4927dda1 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" | |||
38 | 38 | ||
39 | inherit autotools pkgconfig useradd ptest perlnative | 39 | inherit autotools pkgconfig useradd ptest perlnative |
40 | 40 | ||
41 | LDFLAGS_append_mipsarch = " -latomic" | ||
42 | LDFLAGS_append_powerpc = " -latomic" | ||
43 | |||
41 | USERADD_PACKAGES = "${PN}" | 44 | USERADD_PACKAGES = "${PN}" |
42 | USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" | 45 | USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" |
43 | 46 | ||
44 | PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ | 47 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ |
45 | ${@bb.utils.contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ | ||
46 | ${@bb.utils.contains('TARGET_ARCH', 'mipsel', 'noatomics', '', d)} \ | ||
47 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ | ||
48 | " | 48 | " |
49 | PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" | 49 | PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" |
50 | PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," | ||
51 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 50 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
52 | PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," | 51 | PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," |
53 | PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2" | 52 | PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2" |