diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-07-29 15:32:53 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-07-29 15:33:01 +0200 |
| commit | 29220250c10ece3f61581225701fe1334d6a6b43 (patch) | |
| tree | 02235481ee166a2f8aa330dba357890786bd8e10 /depends | |
| parent | f735851be294a1e81468ab10c610528bb072fbaa (diff) | |
| parent | f509e3b8ce0c5652e85ce26545f7ed94689f46ab (diff) | |
| download | bitcoin-29220250c10ece3f61581225701fe1334d6a6b43.tar.xz | |
Merge #16441: build: remove qt libjpeg check from bitcoin_qt.m4
f509e3b8ce0c5652e85ce26545f7ed94689f46ab doc: remove line numbers from qt package links (fanquake)
1bb1661a402de573840d2089fc27f797c8b64f15 doc: fix typo in bitcoin_qt.m4 comment (fanquake)
0aeb98ac1fc5cf62b4516896fa93ac97faafd736 build: remove jpeg lib check from bitcoin_qt.m4 (fanquake)
98a64bd296b06ea0dddf91b08134871158609bbf build: disable libjpeg in qt (fanquake)
Pull request description:
When gitian building on Windows I'm seeing:
```bash
checking for Qt 5... yes
checking for > Qt 5.7... yes
checking for main in -limm32... yes
checking for main in -lz ... yes
checking for library containing jpeg_create_decompress ... configure: WARNING: libjpeg not found. Assuming qt has it built-in
no
checking for library containing png_error ... -lqtlibpng
checking for library containing pcre2_match_16... -lqtpcre2
checking for library containing hb_ot_tags_from_script ... -lqtharfbuzz
```
We are passing `-qt-libjpeg` to Qt:
https://github.com/bitcoin/bitcoin/blob/e6e99d4f757f2e5052f0cc68951c75e91e4753e3/depends/packages/qt.mk#L66
but I dont think we are doing anything with `jpeg` related regardless?
ACKs for top commit:
laanwj:
ACK f509e3b8ce0c5652e85ce26545f7ed94689f46ab
promag:
ACK f509e3b8ce0c5652e85ce26545f7ed94689f46ab.
Tree-SHA512: 61ea20c11df11b9d426644df9a01aac12b76897003121a283fc784a8c30e9b5ad34c9805069fec20926f7aa279e59528e2e13697a944a22760c3acb6366fffbe
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/qt.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 204feb605b..2610c1e748 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -39,6 +39,7 @@ $(package)_config_opts += -no-ico $(package)_config_opts += -no-iconv $(package)_config_opts += -no-kms $(package)_config_opts += -no-linuxfb +$(package)_config_opts += -no-libjpeg $(package)_config_opts += -no-libudev $(package)_config_opts += -no-mtdev $(package)_config_opts += -no-openvg @@ -64,7 +65,6 @@ $(package)_config_opts += -pch $(package)_config_opts += -pkg-config $(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 |