summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/pango/pango.inc
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2012-05-08 22:43:49 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-31 21:15:13 +0100
commitb64eefe2bbdb3dc40b9acc275ca38e4743e5748c (patch)
tree53a4049fdfa14bce9adc8854ddadac4c196b4c3f /meta/recipes-graphics/pango/pango.inc
parent4abd299bf088c70d544668ac52997adab0a4dad8 (diff)
downloadpoky-b64eefe2bbdb3dc40b9acc275ca38e4743e5748c.tar.gz
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 <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.inc12
1 files changed, 10 insertions, 2 deletions
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"
34 34
35EXTRA_OECONF = "--disable-glibtest \ 35EXTRA_OECONF = "--disable-glibtest \
36 --enable-explicit-deps=no \ 36 --enable-explicit-deps=no \
37 --disable-debug" 37 --disable-debug \
38 --with-mlprefix=${MLPREFIX}"
38 39
39LEAD_SONAME = "libpango-1.0*" 40LEAD_SONAME = "libpango-1.0*"
40LIBV = "1.6.0" 41LIBV = "1.6.0"
@@ -49,12 +50,19 @@ if ! [ -e $D${sysconfdir}/pango ] ; then
49fi 50fi
50} 51}
51 52
53do_install_append () {
54 if [ "${MLPREFIX}" != "" ]; then
55 mv ${D}/${bindir}/pango-querymodules ${D}/${bindir}/${MLPREFIX}pango-querymodules
56 fi
57}
58
59
52python populate_packages_prepend () { 60python populate_packages_prepend () {
53 prologue = d.getVar("postinst_prologue", True) 61 prologue = d.getVar("postinst_prologue", True)
54 62
55 modules_root = d.expand('${libdir}/pango/${LIBV}/modules') 63 modules_root = d.expand('${libdir}/pango/${LIBV}/modules')
56 64
57 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') 65 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + '${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules')
58} 66}
59 67
60FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" 68FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"