[OE-core] [PATCH v2] pango: don't try to split modules if none were installed
Phil Blundell
philb at gnu.org
Sun Sep 30 17:48:23 UTC 2012
If pango is configured --with-included-modules then the modules
directory may not exist. Trying to call do_split_modules() on a
nonexistent path leads to python stack traceback spew and a build
failure, so check in advance whether that directory is present before
trying to do any splitting.
Signed-off-by: Phil Blundell <philb at gnu.org>
---
v2: can't use os.path.join() with modules_root as 2nd argument
meta/recipes-graphics/pango/pango.inc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index c9e92f0..18ee068 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -64,8 +64,9 @@ 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 + '${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules')
+
+ if os.path.exists(d.expand('${WORKDIR}/package') + modules_root):
+ 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}"
--
1.7.9
More information about the Openembedded-core
mailing list