From 5174b53b33fe6b2f9d71f7c414e2c83bda9f6c94 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Fri, 29 Jan 2016 14:08:49 -0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-graphics/pango/pango.inc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'meta/recipes-graphics') 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" -- cgit 1.2.3-korg