diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-04-27 15:43:33 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-12 23:47:18 +0100 |
| commit | b0c69fe6a5c206bd96bea768b117e56fbc6044a7 (patch) | |
| tree | 928c0737db8926780cab38d6ccc00c09b91c8c8b /meta/classes | |
| parent | b72c2463f3733da35248dd894ece6e384b5d2f25 (diff) | |
| download | poky-b0c69fe6a5c206bd96bea768b117e56fbc6044a7.tar.gz | |
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.bbclass | 6 |
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 | |||
| 15 | ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-2.0')} \ | 15 | ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-2.0')} \ |
| 16 | $IMFILES > $D${libdir}/gtk-2.0/2.10.0/immodules.cache 2>/dev/null && | 16 | $IMFILES > $D${libdir}/gtk-2.0/2.10.0/immodules.cache 2>/dev/null && |
| 17 | sed -i -e "s:$D::" $D${libdir}/gtk-2.0/2.10.0/immodules.cache | 17 | sed -i -e "s:$D::" $D${libdir}/gtk-2.0/2.10.0/immodules.cache |
| 18 | elif [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then | 18 | fi |
| 19 | if [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then | ||
| 19 | IMFILES=$(ls $D${libdir}/gtk-3.0/*/immodules/*.so) | 20 | IMFILES=$(ls $D${libdir}/gtk-3.0/*/immodules/*.so) |
| 20 | ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-3.0')} \ | 21 | ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-3.0')} \ |
| 21 | $IMFILES > $D${libdir}/gtk-3.0/3.0.0/immodules.cache 2>/dev/null && | 22 | $IMFILES > $D${libdir}/gtk-3.0/3.0.0/immodules.cache 2>/dev/null && |
| @@ -40,7 +41,8 @@ if [ "x$D" != "x" ]; then | |||
| 40 | ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-2.0')} \ | 41 | ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-2.0')} \ |
| 41 | $IMFILES > $D${libdir}/gtk-2.0/2.10.0/immodules.cache 2>/dev/null && | 42 | $IMFILES > $D${libdir}/gtk-2.0/2.10.0/immodules.cache 2>/dev/null && |
| 42 | sed -i -e "s:$D::" $D${libdir}/gtk-2.0/2.10.0/immodules.cache | 43 | sed -i -e "s:$D::" $D${libdir}/gtk-2.0/2.10.0/immodules.cache |
| 43 | elif [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then | 44 | fi |
| 45 | if [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then | ||
| 44 | IMFILES=$(ls $D${libdir}/gtk-3.0/*/immodules/*.so) | 46 | IMFILES=$(ls $D${libdir}/gtk-3.0/*/immodules/*.so) |
| 45 | ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-3.0')} \ | 47 | ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-3.0')} \ |
| 46 | $IMFILES > $D${libdir}/gtk-3.0/3.0.0/immodules.cache 2>/dev/null && | 48 | $IMFILES > $D${libdir}/gtk-3.0/3.0.0/immodules.cache 2>/dev/null && |