From b64eefe2bbdb3dc40b9acc275ca38e4743e5748c Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Tue, 8 May 2012 22:43:49 +0800 Subject: pango: Fix modules load failure in multilib environment Multi-libs of Pango need different modules, thus different config files and utils. This patch separate config file and utils with different MLPREFIX to avoid conflict. [YOCTO #2356] got fixed. (From OE-Core rev: 535e298b98182d95c3280d2d46aa6388e27aac40) Signed-off-by: Zhai Edwin Signed-off-by: Richard Purdie --- meta/recipes-graphics/pango/pango.inc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/pango/pango.inc') diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index a2d5dc3a12..8ed92d3833 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -34,7 +34,8 @@ FULL_OPTIMIZATION_arm = "-O2" EXTRA_OECONF = "--disable-glibtest \ --enable-explicit-deps=no \ - --disable-debug" + --disable-debug \ + --with-mlprefix=${MLPREFIX}" LEAD_SONAME = "libpango-1.0*" LIBV = "1.6.0" @@ -49,12 +50,19 @@ if ! [ -e $D${sysconfdir}/pango ] ; then fi } +do_install_append () { + if [ "${MLPREFIX}" != "" ]; then + mv ${D}/${bindir}/pango-querymodules ${D}/${bindir}/${MLPREFIX}pango-querymodules + fi +} + + python populate_packages_prepend () { prologue = d.getVar("postinst_prologue", True) modules_root = d.expand('${libdir}/pango/${LIBV}/modules') - do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') + do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + '${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules') } FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" -- cgit v1.2.3-54-g00ecf