]> code.ossystems Code Review - openembedded-core.git/commitdiff
cups: make cups-config a multilib script
authorJeremy Puhlman <jpuhlman@mvista.com>
Fri, 28 Feb 2020 22:53:35 +0000 (14:53 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 29 Feb 2020 13:01:29 +0000 (13:01 +0000)
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>
meta/recipes-extended/cups/cups.inc

index 34982819b990bac3b973fe4ac9985dc62f8f4aa5..c5a60bde12cc36f5b8acc2863aa74579be37c909 100644 (file)
@@ -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:'