harfbuzz: enable optional graphite2 support

Enable building harfbuzz with the optional graphite2 support.
Also switch --without-X configure options to the correct/documented
--with-X=no syntax.

Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Gustavo Zacarias 2016-01-14 13:20:52 -03:00 committed by Peter Korsgaard
parent 40c55be207
commit 1588661996

View File

@ -10,16 +10,16 @@ HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
HARFBUZZ_LICENSE = MIT, ISC (ucdn library)
HARFBUZZ_LICENSE_FILES = COPYING src/hb-ucdn/COPYING
HARFBUZZ_INSTALL_STAGING = YES
HARFBUZZ_CONF_OPTS = --without-coretext --without-uniscribe --without-graphite2
HARFBUZZ_CONF_OPTS = --with-coretext=no --with-uniscribe=no
# freetype & glib2 support required by host-pango
HOST_HARFBUZZ_DEPENDENCIES = \
host-freetype \
host-libglib2
HOST_HARFBUZZ_CONF_OPTS = \
--without-corext \
--without-uniscribe \
--without-graphite2 \
--with-coretext=no \
--with-uniscribe=no \
--with-graphite2=no \
--with-cairo=no \
--with-icu=no \
--with-freetype=yes \
@ -44,6 +44,13 @@ else
HARFBUZZ_CONF_OPTS += --with-freetype=no
endif
ifeq ($(BR2_PACKAGE_GRAPHITE2),y)
HARFBUZZ_DEPENDENCIES += graphite2
HARFBUZZ_CONF_OPTS += --with-graphite2=yes
else
HARFBUZZ_CONF_OPTS += --with-graphite2=no
endif
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
HARFBUZZ_DEPENDENCIES += libglib2
HARFBUZZ_CONF_OPTS += --with-glib=yes