summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-daemons/squid/squid_6.12.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-networking/recipes-daemons/squid/squid_6.12.bb b/meta-networking/recipes-daemons/squid/squid_6.12.bb
index cc3d2f25db..a697f21836 100644
--- a/meta-networking/recipes-daemons/squid/squid_6.12.bb
+++ b/meta-networking/recipes-daemons/squid/squid_6.12.bb
@@ -48,7 +48,6 @@ PACKAGECONFIG ??= "auth url-rewrite-helpers \
48PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" 48PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack"
49PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 49PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
50PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," 50PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking,"
51PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2"
52PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl" 51PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl"
53PACKAGECONFIG[auth] = "--enable-auth-basic='${BASIC_AUTH}',--disable-auth --disable-auth-basic,krb5 openldap db cyrus-sasl" 52PACKAGECONFIG[auth] = "--enable-auth-basic='${BASIC_AUTH}',--disable-auth --disable-auth-basic,krb5 openldap db cyrus-sasl"
54PACKAGECONFIG[url-rewrite-helpers] = "--enable-url-rewrite-helpers,--disable-url-rewrite-helpers," 53PACKAGECONFIG[url-rewrite-helpers] = "--enable-url-rewrite-helpers,--disable-url-rewrite-helpers,"
@@ -67,7 +66,9 @@ BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}"
67EXTRA_OECONF += "--with-default-user=squid \ 66EXTRA_OECONF += "--with-default-user=squid \
68 --sysconfdir=${sysconfdir}/${BPN} \ 67 --sysconfdir=${sysconfdir}/${BPN} \
69 --with-logdir=${localstatedir}/log/${BPN} \ 68 --with-logdir=${localstatedir}/log/${BPN} \
70 'PERL=${USRBINPATH}/env perl'" 69 'PERL=${USRBINPATH}/env perl' \
70 --disable-esi \
71"
71 72
72# Workaround a build failure when using a native compiler that need -std=c++17 73# Workaround a build failure when using a native compiler that need -std=c++17
73# with a cross-compiler that doesn't. 74# with a cross-compiler that doesn't.