summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-04-27 15:43:33 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-12 23:47:18 +0100
commitb0c69fe6a5c206bd96bea768b117e56fbc6044a7 (patch)
tree928c0737db8926780cab38d6ccc00c09b91c8c8b /meta/classes
parentb72c2463f3733da35248dd894ece6e384b5d2f25 (diff)
downloadopenembedded-core-contrib-b0c69fe6a5c206bd96bea768b117e56fbc6044a7.tar.gz
openembedded-core-contrib-b0c69fe6a5c206bd96bea768b117e56fbc6044a7.tar.bz2
openembedded-core-contrib-b0c69fe6a5c206bd96bea768b117e56fbc6044a7.zip
gtk-immodules-cache: Support both GTKs at same time
(From OE-Core rev: 0cb5016283a80b04a41d37e332bb324a203e2ef8) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/gtk-immodules-cache.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/gtk-immodules-cache.bbclass b/meta/classes/gtk-immodules-cache.bbclass
index c099cd38e4..3a4634c4ed 100644
--- a/meta/classes/gtk-immodules-cache.bbclass
+++ b/meta/classes/gtk-immodules-cache.bbclass
@@ -15,7 +15,8 @@ if [ "x$D" != "x" ]; then
${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-2.0')} \
$IMFILES > $D${libdir}/gtk-2.0/2.10.0/immodules.cache 2>/dev/null &&
sed -i -e "s:$D::" $D${libdir}/gtk-2.0/2.10.0/immodules.cache
- elif [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then
+ fi
+ if [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then
IMFILES=$(ls $D${libdir}/gtk-3.0/*/immodules/*.so)
${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-3.0')} \
$IMFILES > $D${libdir}/gtk-3.0/3.0.0/immodules.cache 2>/dev/null &&
@@ -40,7 +41,8 @@ if [ "x$D" != "x" ]; then
${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-2.0')} \
$IMFILES > $D${libdir}/gtk-2.0/2.10.0/immodules.cache 2>/dev/null &&
sed -i -e "s:$D::" $D${libdir}/gtk-2.0/2.10.0/immodules.cache
- elif [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then
+ fi
+ if [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then
IMFILES=$(ls $D${libdir}/gtk-3.0/*/immodules/*.so)
${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-3.0')} \
$IMFILES > $D${libdir}/gtk-3.0/3.0.0/immodules.cache 2>/dev/null &&