summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-01-29 14:08:49 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-30 11:40:25 +0000
commit5174b53b33fe6b2f9d71f7c414e2c83bda9f6c94 (patch)
treec7bf6f143d05a1c962d4eccd022c43bf53a22d7a
parent9f099609d0c62877cc89599f5669bb81b209423b (diff)
downloadopenembedded-core-contrib-5174b53b33fe6b2f9d71f7c414e2c83bda9f6c94.tar.gz
openembedded-core-contrib-5174b53b33fe6b2f9d71f7c414e2c83bda9f6c94.tar.bz2
openembedded-core-contrib-5174b53b33fe6b2f9d71f7c414e2c83bda9f6c94.zip
pango.inc: misc dependency fixes
- Add glib-2.0-native dependency for target - Add fontconfig-native and freetype-native dependencies for native - Drop unnecessary dependency on zlib for all Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/pango/pango.inc10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index 63c7d1e1c0..ffa38d8995 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -9,14 +9,10 @@ BUGTRACKER = "http://bugzilla.gnome.org"
SECTION = "libs"
LICENSE = "LGPLv2.0+"
-X11DEPENDS = "virtual/libx11 libxft"
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz"
+DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
-PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}"
-
-BBCLASSEXTEND = "native"
-DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native"
+PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft"
inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even
@@ -43,3 +39,5 @@ RDEPENDS_${PN}-ptest += "liberation-fonts"
RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \
pango-module-basic-fc pango-module-arabic-lang"
+
+BBCLASSEXTEND = "native"