diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-12-07 14:06:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-08 20:22:11 +0000 |
commit | c8f8d1bbb8300956f16d0e3ebc769cf7362fa802 (patch) | |
tree | f322cb500c70315e144692912a4bd586693c1826 /meta/recipes-extended/cups/cups.inc | |
parent | c1c93b4ea4e76b48844ac88dfad738f55961a50e (diff) | |
download | poky-c8f8d1bbb8300956f16d0e3ebc769cf7362fa802.tar.gz |
cups: update 2.3.3op2 -> 2.4.0
Mark no-hardcode-lib patch as upstreamable.
(From OE-Core rev: 2d0475f9575a6679b4a9d5400220584597b84887)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/cups/cups.inc')
-rw-r--r-- | meta/recipes-extended/cups/cups.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index ba9bc6c6a6..3175a91ce4 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc | |||
@@ -40,11 +40,11 @@ SYSTEMD_SERVICE:${PN} = "cups.socket cups.path cups.service cups-lpd.socket" | |||
40 | 40 | ||
41 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ | 41 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ |
42 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" | 42 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" |
43 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" | 43 | PACKAGECONFIG[avahi] = "--with-dnssd=avahi,--with-dnsssd=no,avahi" |
44 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" | 44 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" |
45 | PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls" | 45 | PACKAGECONFIG[gnutls] = "--with-tls=gnutls,--with-tls=no,gnutls" |
46 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" | 46 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" |
47 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--disable-systemd,systemd" | 47 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" |
48 | PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" | 48 | PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" |
49 | 49 | ||
50 | EXTRA_OECONF = " \ | 50 | EXTRA_OECONF = " \ |
@@ -57,6 +57,7 @@ EXTRA_OECONF = " \ | |||
57 | --with-system-groups=lpadmin \ | 57 | --with-system-groups=lpadmin \ |
58 | --with-cups-group=lp \ | 58 | --with-cups-group=lp \ |
59 | --with-domainsocket=/run/cups/cups.sock \ | 59 | --with-domainsocket=/run/cups/cups.sock \ |
60 | --with-pkgconfpath=${libdir}/pkgconfig \ | ||
60 | DSOFLAGS='${LDFLAGS}' \ | 61 | DSOFLAGS='${LDFLAGS}' \ |
61 | " | 62 | " |
62 | 63 | ||