summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2013-01-17 17:53:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-18 13:28:06 +0000
commit26bddbd41b774395a9af73fb659b8e8792e9c3ad (patch)
treea19df0b20ed410f770f9fdcaabf3fb6c3f483987 /meta/recipes-graphics
parentaac03657ee2faeb6e3d50898a81f2e023c661b9d (diff)
downloadpoky-26bddbd41b774395a9af73fb659b8e8792e9c3ad.tar.gz
pango: use qemu_run_binary instead of pango-native
- use qemu_run_binary from qemu.bbclass to run pango-querymodules - remove pango-native from DEPENDS in order to do not create unbuildable dependency chains (e.g. ['gtk+', 'pango', 'pango-native', 'cairo-native', 'directfb-native']) [YOCTO #3642] (From OE-Core rev: c34bb3554112cbaeb4e125ff5ed190c0d3bbcf36) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/pango/pango.inc26
-rw-r--r--meta/recipes-graphics/pango/pango_1.32.5.bb2
2 files changed, 9 insertions, 19 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index ce5caf6120..f62290316d 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -10,7 +10,7 @@ SECTION = "libs"
10LICENSE = "LGPLv2.0+" 10LICENSE = "LGPLv2.0+"
11 11
12X11DEPENDS = "virtual/libx11 libxft" 12X11DEPENDS = "virtual/libx11 libxft"
13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils pango-native harfbuzz" 13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils harfbuzz"
14 14
15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
16PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}" 16PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
@@ -22,7 +22,7 @@ PACKAGES_DYNAMIC += "^pango-module-.*"
22 22
23RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" 23RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc"
24 24
25inherit gnomebase gtk-doc 25inherit gnomebase gtk-doc qemu
26# Create a pango-modules package 26# Create a pango-modules package
27ALLOW_EMPTY_${BPN}-modules = "1" 27ALLOW_EMPTY_${BPN}-modules = "1"
28PACKAGES += "${BPN}-modules" 28PACKAGES += "${BPN}-modules"
@@ -49,26 +49,16 @@ if ! [ -e $D${sysconfdir}/pango ] ; then
49fi 49fi
50 50
51if [ "x$D" != "x" ]; then 51if [ "x$D" != "x" ]; then
52pango-querymodules $(ls -d -1 $D${libdir}/pango/${LIBV}/modules/*.so|\ 52 ${@qemu_run_binary(d, '$D','/usr/bin/pango-querymodules')} \
53 sed -e "s:$D:$NATIVE_ROOT:g") >\ 53 $D${libdir}/pango/${LIBV}/modules/*.so \
54 $D${sysconfdir}/pango/${MLPREFIX}pango.modules \ 54 > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null
55 2>$D${sysconfdir}/pango/${MLPREFIX}pango.err
56
57# pango-querymodules always returns 0, so we need to check if pango.err has
58# anything in it
59if [ -s $D${sysconfdir}/pango/${MLPREFIX}pango.err ]; then
60 rm $D${sysconfdir}/pango/${MLPREFIX}pango.err
61 exit 1
62fi
63 55
64sed -i -e "s:$NATIVE_ROOT::g" $D${sysconfdir}/pango/${MLPREFIX}pango.modules 56 [ $? -ne 0 ] && exit 1
65 57
66# remove the empty pango.err 58 sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules
67rm $D${sysconfdir}/pango/${MLPREFIX}pango.err
68 59
69exit 0 60 exit 0
70fi 61fi
71
72} 62}
73 63
74do_install_append () { 64do_install_append () {
diff --git a/meta/recipes-graphics/pango/pango_1.32.5.bb b/meta/recipes-graphics/pango/pango_1.32.5.bb
index fe93b5207b..6219940b5f 100644
--- a/meta/recipes-graphics/pango/pango_1.32.5.bb
+++ b/meta/recipes-graphics/pango/pango_1.32.5.bb
@@ -2,7 +2,7 @@ require pango.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" 3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4 4
5PR = "r1" 5PR = "r2"
6 6
7GNOME_COMPRESS_TYPE="xz" 7GNOME_COMPRESS_TYPE="xz"
8 8