Skip to content

Commit 4e6b49d

Browse files
fanquakePastaPastaPasta
authored andcommitted
Merge bitcoin#24093: build: specify hosts for qrencode package
bf044ef build: specify hosts for qrencode package (fanquake) Pull request description: Similar to how we specify the OS's we build Qt for, specify which OS's we will build qrencode for (a qt dependency). This commit alone doesn't change anything, but when we start supporting other OS's, i.e bitcoin#23948, where we wont support qt (or at least initially), it'll skip building the qrencode package, which would be unused. I'll rebase the other *BSD changes on top of this. ACKs for top commit: hebasto: ACK bf044ef, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: 3f5f11f122704a664dd77d8da0b7e9b95d44b2f1514d0199deed9b8b8ad0d8883a1de1f444b796c5f4681f423a380c3905fce720d7d2b788130162c907c2ce3b
1 parent 93e7090 commit 4e6b49d

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

depends/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ build_id_string+=system_clang
131131
$(host_arch)_$(host_os)_id_string+=system_clang
132132
endif
133133

134-
qrencode_packages_$(NO_QR) = $(qrencode_packages)
134+
qrencode_packages_$(NO_QR) = $(qrencode_$(host_os)_packages)
135135

136136
qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages) $(qrencode_packages_)
137137

depends/packages/packages.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ packages:=boost libevent gmp bls-dash backtrace cmake immer
22

33
qt_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon
44

5-
qrencode_packages = qrencode
5+
qrencode_linux_packages = qrencode
6+
qrencode_android_packages = qrencode
7+
qrencode_darwin_packages = qrencode
8+
qrencode_mingw32_packages = qrencode
69

710
qt_android_packages=qt
811
qt_darwin_packages=qt

0 commit comments

Comments
 (0)