From: Phil Blundell <philb@gnu.org>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] pango: don't try to split modules if none were installed
Date: Sun, 30 Sep 2012 18:19:39 +0100 [thread overview]
Message-ID: <1349025579.4422.60.camel@x121e.pbcl.net> (raw)
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(-)
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}"
--
1.7.10.4
next reply other threads:[~2012-09-30 17:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-30 17:19 Phil Blundell [this message]
2012-09-30 17:31 ` [PATCH] pango: don't try to split modules if none were installed Phil Blundell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349025579.4422.60.camel@x121e.pbcl.net \
--to=philb@gnu.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox