diff options
| -rw-r--r-- | meta-networking/recipes-daemons/squid/squid_6.12.bb | 5 |
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 \ | |||
| 48 | PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" | 48 | PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" |
| 49 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 49 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
| 50 | PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," | 50 | PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," |
| 51 | PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2" | ||
| 52 | PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl" | 51 | PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl" |
| 53 | PACKAGECONFIG[auth] = "--enable-auth-basic='${BASIC_AUTH}',--disable-auth --disable-auth-basic,krb5 openldap db cyrus-sasl" | 52 | PACKAGECONFIG[auth] = "--enable-auth-basic='${BASIC_AUTH}',--disable-auth --disable-auth-basic,krb5 openldap db cyrus-sasl" |
| 54 | PACKAGECONFIG[url-rewrite-helpers] = "--enable-url-rewrite-helpers,--disable-url-rewrite-helpers," | 53 | PACKAGECONFIG[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)}" | |||
| 67 | EXTRA_OECONF += "--with-default-user=squid \ | 66 | EXTRA_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. |
