mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #21497: build: Do not opt-in unused CoreWLAN stuff in depends for macOS

Browse Source 
810b1310d6 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 810b1310d6 - Only obvious difference I could see in the build is skipping a configure check.

Tree-SHA512: 54e177c4ad528ef48cc80c3a39ab1b66267dd0ca4fe6cc4f70579c87b74051a04ebeeca1a26afee7fc29f750af456804578abbe7e8a9ad2717297291f206547e
This commit is contained in:
fanquake committed 2021-03-23 19:59:09 +08:00
2 parents 55ceaeb8c4 810b1310d6
commit 3c87dbe95c
1 file changed
+1
Download Patch File Download Diff File Expand all files Collapse all files
depends/packages/qt.mk
+1
View File
@@ -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)