package/freetype: unconditionally disable harfbuzz

Commit 939e714393e9d7f60f3a198d831608b08a25662e added an optional
harfbuzz dependency to freetype but this creates a circular dependency
so unconditionally disable it

Fixes:
 - http://autobuild.buildroot.org/results/3cc4ce3207a253186a9c4f8f5151ea0fc0854a28

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index e6463c30b64734dbdc78481954c946fd72170ab4..f4d71bedf725a0cae418d9bb4c199a8d34c511bd 100644 (file)
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -14,6 +14,10 @@ FREETYPE_LICENSE_FILES = docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
 FREETYPE_DEPENDENCIES = host-pkgconf
 FREETYPE_CONFIG_SCRIPTS = freetype-config
 
+# harfbuzz already depends on freetype so disable harfbuzz in freetype to avoid
+# a circular dependency
+FREETYPE_CONF_OPTS = --without-harfbuzz
+
 HOST_FREETYPE_DEPENDENCIES = host-pkgconf
 HOST_FREETYPE_CONF_OPTS = \
        --without-brotli \
@@ -47,13 +51,6 @@ else
 FREETYPE_CONF_OPTS += --without-bzip2
 endif
 
-ifeq ($(BR2_PACKAGE_HARFBUZZ),y)
-FREETYPE_DEPENDENCIES += harfbuzz
-FREETYPE_CONF_OPTS += --with-harbuzz
-else
-FREETYPE_CONF_OPTS += --without-harfbuzz
-endif
-
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 FREETYPE_DEPENDENCIES += libpng
 FREETYPE_CONF_OPTS += --with-png