From eb7172fd2645ee64d39538467472a30b070ed7e5 Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
Date: Wed, 2 Aug 2017 00:08:02 +0200
Subject: freetype: Don't autodetect harfbuzz.

This makes the harfbuzz support explicit: freetype-bootstrap does not
use harfbuzz, but freetype does.
---
 src/freetype-bootstrap.mk | 2 +-
 src/freetype.mk           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/freetype-bootstrap.mk b/src/freetype-bootstrap.mk
index b92057c..0ba9965 100644
--- a/src/freetype-bootstrap.mk
+++ b/src/freetype-bootstrap.mk
@@ -16,5 +16,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    $(freetype_BUILD_COMMON)
+    $(subst harfbuzz=yes,harfbuzz=no,$(freetype_BUILD_COMMON))
 endef
diff --git a/src/freetype.mk b/src/freetype.mk
index 81a614b..b2e7d26 100644
--- a/src/freetype.mk
+++ b/src/freetype.mk
@@ -18,7 +18,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD_COMMON
-    cd '$(1)' && GNUMAKE=$(MAKE) ./configure \
+    cd '$(1)' && GNUMAKE=$(MAKE) ./configure --with-harfbuzz=yes \
         $(MXE_CONFIGURE_OPTS) \
         LIBPNG_CFLAGS="`$(TARGET)-pkg-config libpng --cflags`" \
         LIBPNG_LDFLAGS="`$(TARGET)-pkg-config libpng --libs`" \
-- 
cgit v0.12