]> code.ossystems Code Review - openembedded-core.git/commitdiff
pango.inc: misc dependency fixes
authorAndre McCurdy <armccurdy@gmail.com>
Fri, 29 Jan 2016 22:08:49 +0000 (14:08 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 30 Jan 2016 11:40:25 +0000 (11:40 +0000)
 - 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>
meta/recipes-graphics/pango/pango.inc

index 63c7d1e1c0fb20540bb559ead0e945c3a4003b34..ffa38d899594bce8644820ad784d04b50d2e03fd 100644 (file)
@@ -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"