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:18:48 +0000 |
| commit | 2d0475f9575a6679b4a9d5400220584597b84887 (patch) | |
| tree | 8365dc15363adb97c8074380645cafe4b80167a0 /meta/recipes-extended/cups | |
| parent | 5882ea00a3c9cf0b15958ea3677231a2a31d9a68 (diff) | |
| download | openembedded-core-contrib-2d0475f9575a6679b4a9d5400220584597b84887.tar.gz | |
cups: update 2.3.3op2 -> 2.4.0
Mark no-hardcode-lib patch as upstreamable.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/cups')
| -rw-r--r-- | meta/recipes-extended/cups/cups.inc | 7 | ||||
| -rw-r--r-- | meta/recipes-extended/cups/cups/libexecdir.patch | 50 | ||||
| -rw-r--r-- | meta/recipes-extended/cups/cups_2.4.0.bb (renamed from meta/recipes-extended/cups/cups_2.3.3op2.bb) | 2 |
3 files changed, 34 insertions, 25 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" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" -PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" +PACKAGECONFIG[avahi] = "--with-dnssd=avahi,--with-dnsssd=no,avahi" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" -PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls" +PACKAGECONFIG[gnutls] = "--with-tls=gnutls,--with-tls=no,gnutls" PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" -PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--disable-systemd,systemd" +PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" EXTRA_OECONF = " \ @@ -57,6 +57,7 @@ EXTRA_OECONF = " \ --with-system-groups=lpadmin \ --with-cups-group=lp \ --with-domainsocket=/run/cups/cups.sock \ + --with-pkgconfpath=${libdir}/pkgconfig \ DSOFLAGS='${LDFLAGS}' \ " diff --git a/meta/recipes-extended/cups/cups/libexecdir.patch b/meta/recipes-extended/cups/cups/libexecdir.patch index 2e15841b0d..7ccad94f0f 100644 --- a/meta/recipes-extended/cups/cups/libexecdir.patch +++ b/meta/recipes-extended/cups/cups/libexecdir.patch @@ -1,27 +1,35 @@ -Use $libexecdir instead of hardcoding $prefix/lib as this breaks multilib builds. +From 1724f7bcdbcfdb445778f8a2e530c5c094c18c10 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 13 Jul 2021 12:56:30 +0100 +Subject: [PATCH] Use $libexecdir instead of hardcoding $prefix/lib as this + breaks multilib builds. -Upstream-Status: Inappropriate +Upstream-Status: Pending Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + config-scripts/cups-directories.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 -index 1430af3a6..6efedc604 100644 +index 2033d47..230166e 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 -@@ -265,7 +265,7 @@ case "$host_os_name" in - *-gnu) - # GNUs - INSTALL_SYSV="install-sysv" -- CUPS_SERVERBIN="$exec_prefix/lib/cups" -+ CUPS_SERVERBIN="$libexecdir/cups" - ;; - *bsd* | darwin*) - # *BSD and Darwin (macOS) -@@ -275,7 +275,7 @@ case "$host_os_name" in - *) - # All others - INSTALL_SYSV="install-sysv" -- CUPS_SERVERBIN="$exec_prefix/lib/cups" -+ CUPS_SERVERBIN="$libexecdir/cups" - ;; - esac -
\ No newline at end of file +@@ -239,7 +239,7 @@ AC_SUBST([CUPS_REQUESTS]) + AS_CASE(["$host_os_name"], [*-gnu], [ + # GNUs + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" + ], [*bsd* | darwin*], [ + # *BSD and Darwin (macOS) + INSTALL_SYSV="" +@@ -247,7 +247,7 @@ AS_CASE(["$host_os_name"], [*-gnu], [ + ], [*], [ + # All others + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" + ]) + + AC_DEFINE_UNQUOTED([CUPS_SERVERBIN], ["$CUPS_SERVERBIN"], [Location of server programs.]) diff --git a/meta/recipes-extended/cups/cups_2.3.3op2.bb b/meta/recipes-extended/cups/cups_2.4.0.bb index fc2aa702f5..42be34c4f3 100644 --- a/meta/recipes-extended/cups/cups_2.3.3op2.bb +++ b/meta/recipes-extended/cups/cups_2.4.0.bb @@ -2,4 +2,4 @@ require cups.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df" +SRC_URI[sha256sum] = "9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de" |