diff options
| author | Zhai Edwin <edwin.zhai@intel.com> | 2012-05-08 22:43:49 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-08 16:00:13 +0100 |
| commit | 80c431989eef64d2c34a9cddb7fb95b7b9768706 (patch) | |
| tree | ccfd542db87d82ffc08050b132fdc9f47d9167f0 /meta/recipes-graphics/pango/pango.inc | |
| parent | 370b186b7c39897b868a5e3798a11a285277f145 (diff) | |
| download | openembedded-core-80c431989eef64d2c34a9cddb7fb95b7b9768706.tar.gz openembedded-core-80c431989eef64d2c34a9cddb7fb95b7b9768706.tar.bz2 openembedded-core-80c431989eef64d2c34a9cddb7fb95b7b9768706.zip | |
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.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/pango/pango.inc')
| -rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index e7681b66d6..fbf5027db8 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -37,7 +37,8 @@ FULL_OPTIMIZATION_arm = "-O2" EXTRA_OECONF = "--disable-glibtest \ --disable-introspection \ --enable-explicit-deps=no \ - --disable-debug" + --disable-debug \ + --with-mlprefix=${MLPREFIX}" LEAD_SONAME = "libpango-1.0*" LIBV = "1.6.0" @@ -52,12 +53,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}" |