diff --git a/ci/dash/matrix.sh b/ci/dash/matrix.sh index c33658732c..ab1e542f08 100755 --- a/ci/dash/matrix.sh +++ b/ci/dash/matrix.sh @@ -53,6 +53,7 @@ elif [ "$BUILD_TARGET" = "win64" ]; then export DIRECT_WINE_EXEC_TESTS=true elif [ "$BUILD_TARGET" = "linux32" ]; then export HOST=i686-pc-linux-gnu + export DEP_OPTS="NO_PROTOBUF=1" export BITCOIN_CONFIG="--enable-zmq --disable-bip70 --enable-reduce-exports --enable-crash-hooks" export USE_SHELL="/bin/dash" export PYZMQ=true diff --git a/depends/Makefile b/depends/Makefile index b29b782207..ab4a42ed28 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_PROTOBUF ?= NO_WALLET ?= NO_ZMQ ?= NO_UPNP ?= @@ -134,11 +135,14 @@ wallet_packages_$(NO_WALLET) = $(wallet_packages) upnp_packages_$(NO_UPNP) = $(upnp_packages) zmq_packages_$(NO_ZMQ) = $(zmq_packages) +protobuf_packages_$(NO_PROTOBUF) = $(protobuf_packages) + packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages) -ifneq ($(qt_packages_),) -native_packages += $(qt_native_packages) +ifneq ($(protobuf_packages_),) +native_packages += $(protobuf_native_packages) +packages += $(protobuf_packages) endif ifneq ($(zmq_packages_),) @@ -205,6 +209,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_ -e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \ -e 's|@no_qt@|$(NO_QT)|' \ -e 's|@no_zmq@|$(NO_ZMQ)|' \ + -e 's|@disable_bip70@|$(NO_PROTOBUF)|' \ -e 's|@no_wallet@|$(NO_WALLET)|' \ -e 's|@no_upnp@|$(NO_UPNP)|' \ -e 's|@debug@|$(DEBUG)|' \ diff --git a/depends/README.md b/depends/README.md index 88a279ca6e..138d18d05f 100644 --- a/depends/README.md +++ b/depends/README.md @@ -91,6 +91,8 @@ The following can be set when running make: `make FOO=bar`