All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 10/16] cups: update 2.3.3op2 -> 2.4.0
Date: Tue,  7 Dec 2021 14:06:57 +0100	[thread overview]
Message-ID: <20211207130703.3196805-10-alex@linutronix.de> (raw)
In-Reply-To: <20211207130703.3196805-1-alex@linutronix.de>

Mark no-hardcode-lib patch as upstreamable.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-extended/cups/cups.inc           |  7 +--
 .../cups/cups/libexecdir.patch                | 50 +++++++++++--------
 .../cups/{cups_2.3.3op2.bb => cups_2.4.0.bb}  |  2 +-
 3 files changed, 34 insertions(+), 25 deletions(-)
 rename meta/recipes-extended/cups/{cups_2.3.3op2.bb => cups_2.4.0.bb} (51%)

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
similarity index 51%
rename from meta/recipes-extended/cups/cups_2.3.3op2.bb
rename to 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"
-- 
2.20.1



  parent reply	other threads:[~2021-12-07 13:07 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-07 13:06 [PATCH 01/16] insane.bbclass: do not hardcode oe-core path in upstream-status check Alexander Kanavin
2021-12-07 13:06 ` [PATCH 02/16] python3: drop unneeded multiprocessing module patch Alexander Kanavin
2021-12-07 13:06 ` [PATCH 03/16] libid3tag: move to meta-oe Alexander Kanavin
2021-12-07 13:06 ` [PATCH 04/16] serf: mark patches as inappropriate for upstream submission Alexander Kanavin
2021-12-07 13:06 ` [PATCH 05/16] rustfmt: remove the recipe Alexander Kanavin
2021-12-07 16:01   ` [OE-core] " Khem Raj
2021-12-08  0:10     ` Randy MacLeod
2021-12-07 13:06 ` [PATCH 06/16] python3-pycryptodome: update to 3.12.0 Alexander Kanavin
2021-12-07 13:06 ` [PATCH 07/16] repo: update 2.17.3 -> 2.18 Alexander Kanavin
2021-12-07 13:06 ` [PATCH 08/16] rust: update 1.56.1 -> 1.57.0 Alexander Kanavin
2021-12-07 13:06 ` [PATCH 09/16] strace: update 5.14 -> 5.15 Alexander Kanavin
2021-12-07 13:06 ` Alexander Kanavin [this message]
2021-12-07 13:06 ` [PATCH 11/16] libseccomp: update 2.5.2 -> 2.5.3 Alexander Kanavin
2021-12-07 13:06 ` [PATCH 12/16] erofs-utils: update 1.3 -> 1.4 Alexander Kanavin
2021-12-07 13:07 ` [PATCH 13/16] git: upgrade 2.34.0 -> 2.34.1 Alexander Kanavin
2021-12-07 13:07 ` [PATCH 14/16] go: update 1.17.3 -> 1.17.4 Alexander Kanavin
2021-12-07 13:07 ` [PATCH 15/16] ruby: update 3.0.2 -> 3.0.3 Alexander Kanavin
2021-12-07 15:57   ` [OE-core] " Khem Raj
2021-12-07 18:47     ` Alexander Kanavin
2021-12-07 13:07 ` [PATCH 16/16] libunwind: update 1.6.0 -> 1.6.2 Alexander Kanavin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211207130703.3196805-10-alex@linutronix.de \
    --to=alex.kanavin@gmail.com \
    --cc=alex@linutronix.de \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.