diff options
author | Jeremy Puhlman <jpuhlman@mvista.com> | 2020-02-28 14:53:35 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-29 13:04:48 +0000 |
commit | 8f796d8e8ede87aba5e402192a47786f7e12e26e (patch) | |
tree | 1568a3f12eaf7aa0e439a06c0689eafceb42c225 | |
parent | 4c745fb71221775f224a5583b9430cce7edca604 (diff) | |
download | poky-8f796d8e8ede87aba5e402192a47786f7e12e26e.tar.gz |
cups: make cups-config a multilib script
cups-config encodes the library dir in the script.
(From OE-Core rev: 0e19b25fbf1d760c06dd6a2cb8e291c7482330c4)
Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/cups/cups.inc | 4 |
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" | |||
22 | 22 | ||
23 | CLEANBROKEN = "1" | 23 | CLEANBROKEN = "1" |
24 | 24 | ||
25 | inherit autotools-brokensep binconfig useradd systemd pkgconfig | 25 | inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script |
26 | 26 | ||
27 | USERADD_PACKAGES = "${PN}" | 27 | USERADD_PACKAGES = "${PN}" |
28 | GROUPADD_PARAM_${PN} = "--system lpadmin" | 28 | GROUPADD_PARAM_${PN} = "--system lpadmin" |
@@ -100,6 +100,8 @@ FILES_${PN} += "${datadir}/doc/cups/images \ | |||
100 | " | 100 | " |
101 | CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" | 101 | CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" |
102 | 102 | ||
103 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" | ||
104 | |||
103 | SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" | 105 | SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" |
104 | cups_sysroot_preprocess () { | 106 | cups_sysroot_preprocess () { |
105 | sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' | 107 | sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' |