[OE-core] [PATCH] gtk+3: don't split immodules if we have none
Christopher Larson
kergoth at gmail.com
Wed Aug 28 16:12:22 UTC 2013
From: Christopher Larson <chris_larson at mentor.com>
Currently we don't enable any immodules for gtk+3, yet we unconditionally call
do_split_packages on a nonexistent path. This results in a return value of
None, which it then tries to join, resulting in a TypeError. Only split the
modules if we have any modules to split.
Signed-off-by: Christopher Larson <chris_larson at mentor.com>
---
meta/recipes-gnome/gtk+/gtk+3.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index f4d5254..204a425 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -94,7 +94,8 @@ python populate_packages_prepend () {
immodules_root = os.path.join(gtk_libdir, 'immodules')
printmodules_root = os.path.join(gtk_libdir, 'printbackends');
- d.setVar('GTKIMMODULES_PACKAGES', ' '.join(do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk3-immodule-%s', 'GTK input module for %s')))
+ if os.path.exists(os.path.join(d.getVar('D', True), immodules_root)):
+ d.setVar('GTKIMMODULES_PACKAGES', ' '.join(do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk3-immodule-%s', 'GTK input module for %s')))
do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s')
if (d.getVar('DEBIAN_NAMES', 1)):
--
1.8.3.4
More information about the Openembedded-core
mailing list