From 6340b568b7dc00ad60fc0d16ceeacc91c26053fe Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 8 Oct 2013 14:13:22 +0000 Subject: [PATCH] pango: fix x11 DISTRO_FEATURE check --without-x was removed in 1.32.0, so the correct option is now --without-xft. Also remove --disable-glibtest, as configure.ac doesn't invoke that test. (From OE-Core rev: e806f4ff404515f38318b6fed7d2b614c2138da6) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/pango/pango.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index ea360c7..17006d3 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -13,7 +13,7 @@ X11DEPENDS = "virtual/libx11 libxft" DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz" PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}" +PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}" BBCLASSEXTEND = "native" DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native" @@ -34,8 +34,7 @@ EXTRA_AUTORECONF = "" # seems to go wrong with default cflags FULL_OPTIMIZATION_arm = "-O2" -EXTRA_OECONF = "--disable-glibtest \ - --disable-introspection \ +EXTRA_OECONF = "--disable-introspection \ --enable-explicit-deps=no \ --disable-debug \ --with-mlprefix=${MLPREFIX}" -- 2.7.4