Skip to content

Commit 5e4912f

Browse files
committed
Merge #17730: depends: remove Qt networking features
244501f depends: disable unused qt networking features (fanquake) 29d56c6 depends: -optimized-qmake is now -optimized-tools (fanquake) ccdda96 depends: skip building qt proxies (fanquake) Pull request description: Somewhat of a followup to removing BIP70 support in #17165. This removes networking features from our Qt build. This also removes the need to link against the `CFNetwork` and `SystemConfiguration` libraries on macOS. ```diff src/qt/bitcoin-qt: /usr/lib/libSystem.B.dylib /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit /System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation -/System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration /System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics /System/Library/Frameworks/Carbon.framework/Versions/A/Carbon /usr/lib/libc++.1.dylib -/System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork /System/Library/Frameworks/CoreText.framework/Versions/A/CoreText /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO /usr/lib/libobjc.A.dylib ``` > Introduced the -optimized-tools option; supersedes -optimized-qmake. `optimized-qmake` became `optimized-tools` in Qt 5.6.0. While the former still works, we can use the newer flag. A diff of the removed symbols is available [here](https://gist.github.com/fanquake/9c8d5961c91f90a2966191367adfb391). We still need to actually build the network module, because we are using `QLocalServer` & `QLocalSocket` in the payment server. ACKs for top commit: Sjors: Code review ACK 244501f: just a rebase (_updated since I accidentally repeated the previous hash_) practicalswift: ACK 244501f -- diff looks correct promag: Code review ACK 244501f. Tree-SHA512: 79734e3c96c40e7e484c86ac4cd4f738c05fcebe4771aeac443883f618a6c766e667909d5f8f14f9bd82f43206387c952458c5fa765cd0830f8beda6e6ac80ae
2 parents c3628e4 + 244501f commit 5e4912f

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

depends/packages/qt.mk

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@ $(package)_config_opts += -no-iconv
3939
$(package)_config_opts += -no-kms
4040
$(package)_config_opts += -no-linuxfb
4141
$(package)_config_opts += -no-libjpeg
42+
$(package)_config_opts += -no-libproxy
4243
$(package)_config_opts += -no-libudev
4344
$(package)_config_opts += -no-mtdev
4445
$(package)_config_opts += -no-openssl
4546
$(package)_config_opts += -no-openvg
4647
$(package)_config_opts += -no-reduce-relocations
4748
$(package)_config_opts += -no-qml-debug
49+
$(package)_config_opts += -no-sctp
4850
$(package)_config_opts += -no-securetransport
4951
$(package)_config_opts += -no-sql-db2
5052
$(package)_config_opts += -no-sql-ibase
@@ -55,12 +57,13 @@ $(package)_config_opts += -no-sql-odbc
5557
$(package)_config_opts += -no-sql-psql
5658
$(package)_config_opts += -no-sql-sqlite
5759
$(package)_config_opts += -no-sql-sqlite2
60+
$(package)_config_opts += -no-system-proxies
5861
$(package)_config_opts += -no-use-gold-linker
5962
$(package)_config_opts += -no-xinput2
6063
$(package)_config_opts += -nomake examples
6164
$(package)_config_opts += -nomake tests
6265
$(package)_config_opts += -opensource
63-
$(package)_config_opts += -optimized-qmake
66+
$(package)_config_opts += -optimized-tools
6467
$(package)_config_opts += -pch
6568
$(package)_config_opts += -pkg-config
6669
$(package)_config_opts += -prefix $(host_prefix)
@@ -79,16 +82,20 @@ $(package)_config_opts += -no-feature-dial
7982
$(package)_config_opts += -no-feature-filesystemwatcher
8083
$(package)_config_opts += -no-feature-fontcombobox
8184
$(package)_config_opts += -no-feature-ftp
85+
$(package)_config_opts += -no-feature-http
8286
$(package)_config_opts += -no-feature-image_heuristic_mask
8387
$(package)_config_opts += -no-feature-keysequenceedit
8488
$(package)_config_opts += -no-feature-lcdnumber
89+
$(package)_config_opts += -no-feature-networkdiskcache
90+
$(package)_config_opts += -no-feature-networkproxy
8591
$(package)_config_opts += -no-feature-pdf
8692
$(package)_config_opts += -no-feature-printdialog
8793
$(package)_config_opts += -no-feature-printer
8894
$(package)_config_opts += -no-feature-printpreviewdialog
8995
$(package)_config_opts += -no-feature-printpreviewwidget
9096
$(package)_config_opts += -no-feature-regularexpression
9197
$(package)_config_opts += -no-feature-sessionmanager
98+
$(package)_config_opts += -no-feature-socks5
9299
$(package)_config_opts += -no-feature-sql
93100
$(package)_config_opts += -no-feature-statemachine
94101
$(package)_config_opts += -no-feature-syntaxhighlighter

0 commit comments

Comments
 (0)