diff options
| author | fanquake <fanquake@gmail.com> | 2021-03-23 19:53:48 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-03-23 19:59:09 +0800 |
| commit | 3c87dbe95c925274f80234ad4a88beb5a05fdfff (patch) | |
| tree | 2dcf94a09a779d2f963ef9ef9f25a6533a9e6d6a | |
| parent | 55ceaeb8c4a271a80d0b247ac3ff4135de5b5600 (diff) | |
| parent | 810b1310d6173250df850db0538e7f1b1cfb2843 (diff) | |
| download | bitcoin-3c87dbe95c925274f80234ad4a88beb5a05fdfff.tar.xz | |
Merge #21497: build: Do not opt-in unused CoreWLAN stuff in depends for macOS
810b1310d6173250df850db0538e7f1b1cfb2843 build: Do not build unused CoreWLAN stuff in depends for macOS (Hennadii Stepanov)
Pull request description:
We [do not use](https://github.com/bitcoin/bitcoin/blob/d2a78ee9288e4d3bace9125bcfae6b7747f85982/contrib/devtools/symbol-check.py#L96-L111) any macOS CoreWLAN Framework stuff.
Changes in Qt Configure summary with `HOST=x86_64-apple-darwin18`:
```diff
--- wlan-master/summary2021-03-22 00:26:04.377387806 +0200
+++ wlan-pr/summary2021-03-22 00:37:07.060997990 +0200
@@ -49,7 +49,7 @@
slog2 ................................ no
Using system PCRE2 ..................... no
Qt Network:
- CoreWLan ............................... yes
+ CoreWLan ............................... no
getifaddrs() ........................... yes
IPv6 ifname ............................ yes
libproxy ............................... no
```
ACKs for top commit:
fanquake:
ACK 810b1310d6173250df850db0538e7f1b1cfb2843 - Only obvious difference I could see in the build is skipping a configure check.
Tree-SHA512: 54e177c4ad528ef48cc80c3a39ab1b66267dd0ca4fe6cc4f70579c87b74051a04ebeeca1a26afee7fc29f750af456804578abbe7e8a9ad2717297291f206547e
| -rw-r--r-- | depends/packages/qt.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 0ac6f496c4..7d96197221 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -111,6 +111,7 @@ $(package)_config_opts += -no-feature-xml $(package)_config_opts_darwin = -no-dbus $(package)_config_opts_darwin += -no-opengl $(package)_config_opts_darwin += -pch +$(package)_config_opts_darwin += -no-feature-corewlan $(package)_config_opts_darwin += -device-option QMAKE_MACOSX_DEPLOYMENT_TARGET=$(OSX_MIN_VERSION) ifneq ($(build_os),darwin) |