sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport bitcoin#14385: qt: avoid system harfbuzz and bz2 (#2732)

Browse Source 
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.
This commit is contained in:
fish-en 2019-03-02 00:29:48 +09:00 committed by UdjinM6
parent 2041186f4d
commit 080b59a573
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
depends/packages/freetype.mk
View File

@ -5,7 +5,7 @@ $(package)_file_name=$(package)-$($(package)_version).tar.bz2
$(package)_sha256_hash=3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88 $(package)_sha256_hash=3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88
define $(package)_set_vars 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 $(package)_config_opts_linux=--with-pic
endef endef

1
depends/packages/qt.mk
View File

@ -76,6 +76,7 @@ $(package)_config_opts += -prefix $(host_prefix)
$(package)_config_opts += -qt-libpng $(package)_config_opts += -qt-libpng
$(package)_config_opts += -qt-libjpeg $(package)_config_opts += -qt-libjpeg
$(package)_config_opts += -qt-pcre $(package)_config_opts += -qt-pcre
$(package)_config_opts += -qt-harfbuzz
$(package)_config_opts += -system-zlib $(package)_config_opts += -system-zlib
$(package)_config_opts += -reduce-exports $(package)_config_opts += -reduce-exports
$(package)_config_opts += -static $(package)_config_opts += -static