sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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 master rev: e806f4ff404515f38318b6fed7d2b614c2138da6)

(From OE-Core rev: 147eac9794bd815f7f10002beacbe47302352ca4)

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>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2013-10-08 14:13:22 +00:00 committed by Richard Purdie
parent b5c4bad0bf
commit 042fec8fc3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/recipes-graphics/pango/pango.inc
View File

@ -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}"