diff options
| author | Cory Fields <[email protected]> | 2018-10-03 16:49:51 -0400 |
|---|---|---|
| committer | Cory Fields <[email protected]> | 2018-10-03 16:50:42 -0400 |
| commit | f149e31ea2f28b72dbc3e7d7a8fe31466eabef85 (patch) | |
| tree | c3b5189695c31937c38c25b578588a22fc26f255 | |
| parent | Merge #14325: [gitian] use versioned unsigned tarballs instead of generically... (diff) | |
| download | discoin-f149e31ea2f28b72dbc3e7d7a8fe31466eabef85.tar.xz discoin-f149e31ea2f28b72dbc3e7d7a8fe31466eabef85.zip | |
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.
| -rw-r--r-- | depends/packages/freetype.mk | 2 | ||||
| -rw-r--r-- | depends/packages/qt.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/depends/packages/freetype.mk b/depends/packages/freetype.mk index 76b025c46..41e02e203 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 d15f147cd..dc1d17cd5 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 |