| Submitter | Phil Blundell |
|---|---|
| Date | Sept. 30, 2012, 5:19 p.m. |
| Message ID | <1349025579.4422.60.camel@x121e.pbcl.net> |
| Download | mbox | patch |
| Permalink | /patch/37507/ |
| State | New |
| Headers | show |
Comments
On Sun, 2012-09-30 at 18:19 +0100, Phil Blundell wrote: > - 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(os.path.join(d.expand('${D}'), 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') > } Hm, I seem to have sent the wrong version of this patch. Please ignore that one. p.
Patch
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index c9e92f0..8eb920a 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(os.path.join(d.expand('${D}'), 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}"
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@gnu.org> --- meta/recipes-graphics/pango/pango.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)