Skip to content

Commit

Permalink
Merge #21497: build: Do not opt-in unused CoreWLAN stuff in depends f…
Browse files Browse the repository at this point in the history
…or 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
  • Loading branch information
fanquake committed Mar 23, 2021
2 parents 55ceaeb + 810b131 commit 3c87dbe
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions depends/packages/qt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 3c87dbe

Please sign in to comment.