From f149e31ea2f28b72dbc3e7d7a8fe31466eabef85 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 3 Oct 2018 16:49:51 -0400
Subject: depends: qt: avoid system harfbuzz and bz2

We may eventually want to break out harfbuzz and build it in depends, but
for now just ensure that runtime dependencies don't depend on whether or not
harfbuzz was present on the builder.
---
 depends/packages/freetype.mk | 2 +-
 depends/packages/qt.mk       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'depends')

diff --git a/depends/packages/freetype.mk b/depends/packages/freetype.mk
index 76b025c463..41e02e2030 100644
--- a/depends/packages/freetype.mk
+++ b/depends/packages/freetype.mk
@@ -5,7 +5,7 @@ $(package)_file_name=$(package)-$($(package)_version).tar.bz2
 $(package)_sha256_hash=3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88
 
 define $(package)_set_vars
-  $(package)_config_opts=--without-zlib --without-png --disable-static
+  $(package)_config_opts=--without-zlib --without-png --without-harfbuzz --without-bzip2 --disable-static
   $(package)_config_opts_linux=--with-pic
 endef
 
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index d15f147cd7..dc1d17cd57 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -64,6 +64,7 @@ $(package)_config_opts += -prefix $(host_prefix)
 $(package)_config_opts += -qt-libpng
 $(package)_config_opts += -qt-libjpeg
 $(package)_config_opts += -qt-pcre
+$(package)_config_opts += -qt-harfbuzz
 $(package)_config_opts += -system-zlib
 $(package)_config_opts += -static
 $(package)_config_opts += -silent
-- 
cgit v1.2.3