summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorJeremy Puhlman <jpuhlman@mvista.com>2020-02-28 14:53:35 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-29 13:01:29 +0000
commit0e19b25fbf1d760c06dd6a2cb8e291c7482330c4 (patch)
treec8a3a77de9aa7688e2f8124d1b1614149979c6e8 /meta/recipes-extended
parent3682d0ca3ffeb84fd2f935a9c9b253e015c9e137 (diff)
downloadopenembedded-core-contrib-0e19b25fbf1d760c06dd6a2cb8e291c7482330c4.tar.gz
cups: make cups-config a multilib script
cups-config encodes the library dir in the script. Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/cups/cups.inc4
1 files changed, 3 insertions, 1 deletions
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:'