summaryrefslogtreecommitdiffstats
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:46:39 +0100
commit0cb5016283a80b04a41d37e332bb324a203e2ef8 (patch)
treee7b9f8ce6fb2d6ac974af3d3856e063d49fa37d1
parentd21edfa50aa1d3f4db35903545242888223768b6 (diff)
downloadopenembedded-core-contrib-0cb5016283a80b04a41d37e332bb324a203e2ef8.tar.gz
openembedded-core-contrib-0cb5016283a80b04a41d37e332bb324a203e2ef8.tar.bz2
openembedded-core-contrib-0cb5016283a80b04a41d37e332bb324a203e2ef8.zip
gtk-immodules-cache: Support both GTKs at same time
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 &&