[oe-commits] Christopher Larson : gtk+3: only set GTKIMMODULES_PACKAGES if we have immodules

git at git.openembedded.org git at git.openembedded.org
Fri Aug 30 15:17:00 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: 9191c8b08ea25641d228acc83f2d4ad6a14333fe
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9191c8b08ea25641d228acc83f2d4ad6a14333fe

Author: Christopher Larson <chris_larson at mentor.com>
Date:   Thu Aug 29 09:28:55 2013 -0700

gtk+3: only set GTKIMMODULES_PACKAGES if we have immodules

Signed-off-by: Christopher Larson <chris_larson at mentor.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-gnome/gtk+/gtk+3.inc |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index f4d5254..e769ca5 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -94,7 +94,10 @@ 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')))
+    immodules = do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk3-immodule-%s', 'GTK input module for %s')
+    if immodules:
+        d.setVar("GTKIMMODULES_PACKAGES", " ".join(immodules))
+
     do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s')
 
     if (d.getVar('DEBIAN_NAMES', 1)):



More information about the Openembedded-commits mailing list