Skip to content

Commit c8becb8

Browse files
committed
depends: add ability to skip building qrencode
1 parent e354db7 commit c8becb8

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

depends/Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ WORK_PATH = $(BASEDIR)/work
99
BASE_CACHE ?= $(BASEDIR)/built
1010
SDK_PATH ?= $(BASEDIR)/SDKs
1111
NO_QT ?=
12+
NO_QR ?=
1213
RAPIDCHECK ?=
1314
NO_WALLET ?=
1415
NO_ZMQ ?=
@@ -100,7 +101,10 @@ $(host_arch)_$(host_os)_id_string+=$(shell $(host_CXX) --version 2>/dev/null)
100101
$(host_arch)_$(host_os)_id_string+=$(shell $(host_RANLIB) --version 2>/dev/null)
101102
$(host_arch)_$(host_os)_id_string+=$(shell $(host_STRIP) --version 2>/dev/null)
102103

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+
104108
wallet_packages_$(NO_WALLET) = $(wallet_packages)
105109
upnp_packages_$(NO_UPNP) = $(upnp_packages)
106110
zmq_packages_$(NO_ZMQ) = $(zmq_packages)
@@ -154,6 +158,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
154158
-e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \
155159
-e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \
156160
-e 's|@no_qt@|$(NO_QT)|' \
161+
-e 's|@no_qr@|$(NO_QR)|' \
157162
-e 's|@no_zmq@|$(NO_ZMQ)|' \
158163
-e 's|@no_wallet@|$(NO_WALLET)|' \
159164
-e 's|@no_upnp@|$(NO_UPNP)|' \

depends/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ The following can be set when running make: make FOO=bar
7676
SDK_PATH: Path where sdk's can be found (used by macOS)
7777
FALLBACK_DOWNLOAD_PATH: If a source file can't be fetched, try here before giving up
7878
NO_QT: Don't download/build/cache qt and its dependencies
79+
NO_QR: Don't download/build/cache packages needed for enabling qrencode
7980
NO_ZMQ: Don't download/build/cache packages needed for enabling zeromq
8081
NO_WALLET: Don't download/build/cache libs needed to enable the wallet
8182
NO_UPNP: Don't download/build/cache packages needed for enabling upnp

depends/config.site.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ if test -z $with_qt_bindir && test -z "@no_qt@"; then
1717
with_qt_bindir=$depends_prefix/native/bin
1818
fi
1919

20+
if test -z $with_qrencode && test -n "@no_qr@"; then
21+
with_qrencode=no
22+
fi
23+
2024
if test -z $enable_wallet && test -n "@no_wallet@"; then
2125
enable_wallet=no
2226
fi

depends/packages/packages.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
packages:=boost libevent
22

3-
qt_packages = qrencode zlib
3+
qt_packages = zlib
4+
5+
qrencode_packages = qrencode
46

57
qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig
68
qt_android_packages=qt

0 commit comments

Comments
 (0)