From 8f796d8e8ede87aba5e402192a47786f7e12e26e Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman Date: Fri, 28 Feb 2020 14:53:35 -0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-extended/cups/cups.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-extended/cups/cups.inc') 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:' -- cgit v1.2.3-54-g00ecf