diff options
| author | Christopher Larson <chris_larson@mentor.com> | 2013-08-29 09:28:55 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-30 16:23:47 +0100 |
| commit | 7034d50765349d32090b36a677384878bc16c97f (patch) | |
| tree | f483b67cc0f359debc74629e9b75a86fcba63413 | |
| parent | 249dc825a006e465e9611f5f06e8a99882ed8ed1 (diff) | |
| download | poky-7034d50765349d32090b36a677384878bc16c97f.tar.gz | |
gtk+3: only set GTKIMMODULES_PACKAGES if we have immodules
(From OE-Core rev: 9191c8b08ea25641d228acc83f2d4ad6a14333fe)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | 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 f4d5254e43..e769ca58bc 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 () { | |||
| 94 | immodules_root = os.path.join(gtk_libdir, 'immodules') | 94 | immodules_root = os.path.join(gtk_libdir, 'immodules') |
| 95 | printmodules_root = os.path.join(gtk_libdir, 'printbackends'); | 95 | printmodules_root = os.path.join(gtk_libdir, 'printbackends'); |
| 96 | 96 | ||
| 97 | d.setVar('GTKIMMODULES_PACKAGES', ' '.join(do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk3-immodule-%s', 'GTK input module for %s'))) | 97 | immodules = do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk3-immodule-%s', 'GTK input module for %s') |
| 98 | if immodules: | ||
| 99 | d.setVar("GTKIMMODULES_PACKAGES", " ".join(immodules)) | ||
| 100 | |||
| 98 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') | 101 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') |
| 99 | 102 | ||
| 100 | if (d.getVar('DEBIAN_NAMES', 1)): | 103 | if (d.getVar('DEBIAN_NAMES', 1)): |