summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-10-08 14:13:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-14 16:55:26 +0100
commit76fcef6c0fc2b93dfcead17817dc091b24b7c4e8 (patch)
treeb53530e79b8783675ba126dc4894c7b4248c1b45 /meta
parentb5fcad80917a3c17712f35f2fccce78ff434cd6a (diff)
downloadpoky-76fcef6c0fc2b93dfcead17817dc091b24b7c4e8.tar.gz
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 <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')
-rw-r--r--meta/recipes-graphics/pango/pango.inc5
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"
13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz" 13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz"
14 14
15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
16PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}" 16PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}"
17 17
18BBCLASSEXTEND = "native" 18BBCLASSEXTEND = "native"
19DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native" 19DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native"
@@ -34,8 +34,7 @@ EXTRA_AUTORECONF = ""
34# seems to go wrong with default cflags 34# seems to go wrong with default cflags
35FULL_OPTIMIZATION_arm = "-O2" 35FULL_OPTIMIZATION_arm = "-O2"
36 36
37EXTRA_OECONF = "--disable-glibtest \ 37EXTRA_OECONF = "--disable-introspection \
38 --disable-introspection \
39 --enable-explicit-deps=no \ 38 --enable-explicit-deps=no \
40 --disable-debug \ 39 --disable-debug \
41 --with-mlprefix=${MLPREFIX}" 40 --with-mlprefix=${MLPREFIX}"