File tree Expand file tree Collapse file tree 4 files changed +14
-2
lines changed Expand file tree Collapse file tree 4 files changed +14
-2
lines changed Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ WORK_PATH = $(BASEDIR)/work
9
9
BASE_CACHE ?= $(BASEDIR ) /built
10
10
SDK_PATH ?= $(BASEDIR ) /SDKs
11
11
NO_QT ?=
12
+ NO_QR ?=
12
13
RAPIDCHECK ?=
13
14
NO_WALLET ?=
14
15
NO_ZMQ ?=
@@ -100,7 +101,10 @@ $(host_arch)_$(host_os)_id_string+=$(shell $(host_CXX) --version 2>/dev/null)
100
101
$(host_arch)_$(host_os)_id_string+ =$(shell $(host_RANLIB ) --version 2>/dev/null)
101
102
$(host_arch)_$(host_os)_id_string+ =$(shell $(host_STRIP ) --version 2>/dev/null)
102
103
103
- qt_packages_$(NO_QT) = $(qt_packages ) $(qt_$(host_os ) _packages ) $(qt_$(host_arch ) _$(host_os ) _packages )
104
+ qrencode_packages_$(NO_QR) = $(qrencode_packages )
105
+
106
+ qt_packages_$(NO_QT) = $(qt_packages ) $(qt_$(host_os ) _packages ) $(qt_$(host_arch ) _$(host_os ) _packages ) $(qrencode_packages_ )
107
+
104
108
wallet_packages_$(NO_WALLET) = $(wallet_packages )
105
109
upnp_packages_$(NO_UPNP) = $(upnp_packages )
106
110
zmq_packages_$(NO_ZMQ) = $(zmq_packages )
@@ -154,6 +158,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
154
158
-e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \
155
159
-e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \
156
160
-e 's|@no_qt@|$(NO_QT)|' \
161
+ -e 's|@no_qr@|$(NO_QR)|' \
157
162
-e 's|@no_zmq@|$(NO_ZMQ)|' \
158
163
-e 's|@no_wallet@|$(NO_WALLET)|' \
159
164
-e 's|@no_upnp@|$(NO_UPNP)|' \
Original file line number Diff line number Diff line change @@ -76,6 +76,7 @@ The following can be set when running make: make FOO=bar
76
76
SDK_PATH: Path where sdk's can be found (used by macOS)
77
77
FALLBACK_DOWNLOAD_PATH: If a source file can't be fetched, try here before giving up
78
78
NO_QT: Don't download/build/cache qt and its dependencies
79
+ NO_QR: Don't download/build/cache packages needed for enabling qrencode
79
80
NO_ZMQ: Don't download/build/cache packages needed for enabling zeromq
80
81
NO_WALLET: Don't download/build/cache libs needed to enable the wallet
81
82
NO_UPNP: Don't download/build/cache packages needed for enabling upnp
Original file line number Diff line number Diff line change @@ -17,6 +17,10 @@ if test -z $with_qt_bindir && test -z "@no_qt@"; then
17
17
with_qt_bindir=$depends_prefix/native/bin
18
18
fi
19
19
20
+ if test -z $with_qrencode && test -n "@no_qr@"; then
21
+ with_qrencode=no
22
+ fi
23
+
20
24
if test -z $enable_wallet && test -n "@no_wallet@"; then
21
25
enable_wallet=no
22
26
fi
Original file line number Diff line number Diff line change 1
1
packages: =boost libevent
2
2
3
- qt_packages = qrencode zlib
3
+ qt_packages = zlib
4
+
5
+ qrencode_packages = qrencode
4
6
5
7
qt_linux_packages: =qt expat libxcb xcb_proto libXau xproto freetype fontconfig
6
8
qt_android_packages =qt
You can’t perform that action at this time.
0 commit comments