diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-10-08 14:13:22 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-14 16:54:29 +0100 |
| commit | e806f4ff404515f38318b6fed7d2b614c2138da6 (patch) | |
| tree | 7d04fb3b78990bcbdc820e128f71ac60a3f5800a /meta/recipes-graphics/pango | |
| parent | e8853d58db75a1e1453f2d517fb533f086c2dab2 (diff) | |
| download | openembedded-core-e806f4ff404515f38318b6fed7d2b614c2138da6.tar.gz openembedded-core-e806f4ff404515f38318b6fed7d2b614c2138da6.tar.bz2 openembedded-core-e806f4ff404515f38318b6fed7d2b614c2138da6.zip | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/pango')
| -rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index ea360c7cd6..17006d386c 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}" |