From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.pbcl.net ([88.198.119.4] helo=hetzner.pbcl.net) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1TINrk-0006e8-C3 for openembedded-core@lists.openembedded.org; Sun, 30 Sep 2012 20:03:44 +0200 Received: from blundell.swaffham-prior.co.uk ([91.216.112.25] helo=[192.168.114.6]) by hetzner.pbcl.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TINfG-000492-LM for openembedded-core@lists.openembedded.org; Sun, 30 Sep 2012 19:50:50 +0200 Message-ID: <1349027303.4422.63.camel@x121e.pbcl.net> From: Phil Blundell To: openembedded-core@lists.openembedded.org Date: Sun, 30 Sep 2012 18:48:23 +0100 X-Mailer: Evolution 3.4.3-1 Mime-Version: 1.0 Subject: [PATCH v2] pango: don't try to split modules if none were installed X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Sep 2012 18:03:44 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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 --- 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