Skip to content

Commit 3c87dbe

Browse files
committed
Merge #21497: build: Do not opt-in unused CoreWLAN stuff in depends for macOS
810b131 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 810b131 - Only obvious difference I could see in the build is skipping a configure check. Tree-SHA512: 54e177c4ad528ef48cc80c3a39ab1b66267dd0ca4fe6cc4f70579c87b74051a04ebeeca1a26afee7fc29f750af456804578abbe7e8a9ad2717297291f206547e
2 parents 55ceaeb + 810b131 commit 3c87dbe

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

depends/packages/qt.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ $(package)_config_opts += -no-feature-xml
111111
$(package)_config_opts_darwin = -no-dbus
112112
$(package)_config_opts_darwin += -no-opengl
113113
$(package)_config_opts_darwin += -pch
114+
$(package)_config_opts_darwin += -no-feature-corewlan
114115
$(package)_config_opts_darwin += -device-option QMAKE_MACOSX_DEPLOYMENT_TARGET=$(OSX_MIN_VERSION)
115116

116117
ifneq ($(build_os),darwin)

0 commit comments

Comments
 (0)