[OE-core] [PATCH 3/3] cups: make cups-config a multilib script

Jeremy A. Puhlman jpuhlman at mvista.com
Fri Feb 28 22:53:35 UTC 2020


From: Jeremy Puhlman <jpuhlman at mvista.com>

cups-config encodes the library dir in the script.

Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
---
 meta/recipes-extended/cups/cups.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 34982819b9..c5a60bde12 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -22,7 +22,7 @@ LEAD_SONAME = "libcupsdriver.so"
 
 CLEANBROKEN = "1"
 
-inherit autotools-brokensep binconfig useradd systemd pkgconfig
+inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "--system lpadmin"
@@ -100,6 +100,8 @@ FILES_${PN} += "${datadir}/doc/cups/images \
                "
 CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf"
 
+MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config"
+
 SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess"
 cups_sysroot_preprocess () {
 	sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:'
-- 
2.20.1



More information about the Openembedded-core mailing list