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:06:42 +0100 |
commit | 38467c458fdca97a5b0f2aa91de96f81330dc8de (patch) | |
tree | 205d2bbeed902a3fff0bf455e8387ff6b6988cee /meta/recipes-graphics/pango/pango.inc | |
parent | c4a7a24cb5185d2449e75156e03a0c3649602ed3 (diff) | |
download | poky-38467c458fdca97a5b0f2aa91de96f81330dc8de.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: 80c431989eef64d2c34a9cddb7fb95b7b9768706)
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" | |||
37 | EXTRA_OECONF = "--disable-glibtest \ | 37 | EXTRA_OECONF = "--disable-glibtest \ |
38 | --disable-introspection \ | 38 | --disable-introspection \ |
39 | --enable-explicit-deps=no \ | 39 | --enable-explicit-deps=no \ |
40 | --disable-debug" | 40 | --disable-debug \ |
41 | --with-mlprefix=${MLPREFIX}" | ||
41 | 42 | ||
42 | LEAD_SONAME = "libpango-1.0*" | 43 | LEAD_SONAME = "libpango-1.0*" |
43 | LIBV = "1.6.0" | 44 | LIBV = "1.6.0" |
@@ -52,12 +53,19 @@ if ! [ -e $D${sysconfdir}/pango ] ; then | |||
52 | fi | 53 | fi |
53 | } | 54 | } |
54 | 55 | ||
56 | do_install_append () { | ||
57 | if [ "${MLPREFIX}" != "" ]; then | ||
58 | mv ${D}/${bindir}/pango-querymodules ${D}/${bindir}/${MLPREFIX}pango-querymodules | ||
59 | fi | ||
60 | } | ||
61 | |||
62 | |||
55 | python populate_packages_prepend () { | 63 | python populate_packages_prepend () { |
56 | prologue = d.getVar("postinst_prologue", True) | 64 | prologue = d.getVar("postinst_prologue", True) |
57 | 65 | ||
58 | modules_root = d.expand('${libdir}/pango/${LIBV}/modules') | 66 | modules_root = d.expand('${libdir}/pango/${LIBV}/modules') |
59 | 67 | ||
60 | do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') | 68 | do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + '${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules') |
61 | } | 69 | } |
62 | 70 | ||
63 | FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" | 71 | FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" |