diff --git a/depends/Makefile b/depends/Makefile index 20835345b9..7a728019cb 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -33,6 +33,7 @@ WORK_PATH = $(BASEDIR)/work BASE_CACHE ?= $(BASEDIR)/built SDK_PATH ?= $(BASEDIR)/SDKs NO_QT ?= +NO_QR ?= NO_WALLET ?= NO_ZMQ ?= NO_UPNP ?= @@ -130,7 +131,10 @@ build_id_string+=system_clang $(host_arch)_$(host_os)_id_string+=system_clang endif -qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages) +qrencode_packages_$(NO_QR) = $(qrencode_packages) + +qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages) $(qrencode_packages_) + wallet_packages_$(NO_WALLET) = $(wallet_packages) upnp_packages_$(NO_UPNP) = $(upnp_packages) natpmp_packages_$(NO_NATPMP) = $(natpmp_packages) @@ -203,6 +207,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_ -e 's|@CPPFLAGS@|$(strip $(host_CPPFLAGS) $(host_$(release_type)_CPPFLAGS))|' \ -e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \ -e 's|@no_qt@|$(NO_QT)|' \ + -e 's|@no_qr@|$(NO_QR)|' \ -e 's|@no_zmq@|$(NO_ZMQ)|' \ -e 's|@no_wallet@|$(NO_WALLET)|' \ -e 's|@no_upnp@|$(NO_UPNP)|' \ diff --git a/depends/README.md b/depends/README.md index 1b0c60a0a2..357c01faf9 100644 --- a/depends/README.md +++ b/depends/README.md @@ -83,6 +83,8 @@ The following can be set when running make: `make FOO=bar`
If a source file can't be fetched, try here before giving up
NO_QT
Don't download/build/cache qt and its dependencies
+
NO_QR
+
Don't download/build/cache packages needed for enabling qrencode
NO_ZMQ
Don't download/build/cache packages needed for enabling zeromq
NO_WALLET
diff --git a/depends/config.site.in b/depends/config.site.in index d6c97c8066..f736a9ab6f 100644 --- a/depends/config.site.in +++ b/depends/config.site.in @@ -27,6 +27,10 @@ if test -z $with_qt_bindir; then with_qt_bindir=$depends_prefix/native/bin fi +if test -z $with_qrencode && test -n "@no_qr@"; then + with_qrencode=no +fi + if test -z $enable_wallet && test -n "@no_wallet@"; then enable_wallet=no fi diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 99d1dba2e3..5c1237b695 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -1,9 +1,9 @@ packages:=boost libevent gmp bls-dash backtrace cmake immer -qt_packages = qrencode - qt_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon +qrencode_packages = qrencode + qt_android_packages=qt qt_darwin_packages=qt qt_mingw32_packages=qt