Skip to content

Commit 2d7ffce

Browse files
committed
Merge bitcoin/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 #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
2 parents 5c3bfee + bf044ef commit 2d7ffce

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

depends/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ include packages/packages.mk
137137
build_id:=$(shell env CC='$(build_CC)' CXX='$(build_CXX)' AR='$(build_AR)' RANLIB='$(build_RANLIB)' STRIP='$(build_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
138138
$(host_arch)_$(host_os)_id:=$(shell env CC='$(host_CC)' CXX='$(host_CXX)' AR='$(host_AR)' RANLIB='$(host_RANLIB)' STRIP='$(host_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' ./gen_id '$(HOST_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
139139

140-
qrencode_packages_$(NO_QR) = $(qrencode_packages)
140+
qrencode_packages_$(NO_QR) = $(qrencode_$(host_os)_packages)
141141

142142
qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages) $(qrencode_packages_)
143143

depends/packages/packages.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
packages:=boost libevent
22

3-
qrencode_packages = qrencode
3+
qrencode_linux_packages = qrencode
4+
qrencode_android_packages = qrencode
5+
qrencode_darwin_packages = qrencode
6+
qrencode_mingw32_packages = qrencode
47

58
qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
69
qt_android_packages=qt
7-
810
qt_darwin_packages=qt
911
qt_mingw32_packages=qt
1012

0 commit comments

Comments
 (0)