build: remove protobuf from depends

fanquake · fanquake · commit 67328bb7ca57 · 2019-10-24T16:01:42.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -104,7 +104,7 @@ jobs:
         FILE_ENV="./ci/test/00_setup_env_win64.sh"
 
     - stage: test
-      name: '32-bit + dash  [GOAL: install]  [GUI: BIP70 enabled]'
+      name: '32-bit + dash  [GOAL: install]  [gui]'
       env: >-
         FILE_ENV="./ci/test/00_setup_env_i686.sh"
 
diff --git a/ci/test/00_setup_env_i686.sh b/ci/test/00_setup_env_i686.sh
@@ -7,8 +7,7 @@
 export LC_ALL=C.UTF-8
 
 export HOST=i686-pc-linux-gnu
-export DEP_OPTS="PROTOBUF=1"
 export PACKAGES="g++-multilib python3-zmq"
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-bip70 --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++"
+export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++"
 export CONFIG_SHELL="/bin/dash"
diff --git a/depends/Makefile b/depends/Makefile
@@ -9,7 +9,6 @@ WORK_PATH = $(BASEDIR)/work
 BASE_CACHE ?= $(BASEDIR)/built
 SDK_PATH ?= $(BASEDIR)/SDKs
 NO_QT ?=
-PROTOBUF ?=
 RAPIDCHECK ?=
 NO_WALLET ?=
 NO_ZMQ ?=
@@ -101,17 +100,11 @@ wallet_packages_$(NO_WALLET) = $(wallet_packages)
 upnp_packages_$(NO_UPNP) = $(upnp_packages)
 zmq_packages_$(NO_ZMQ) = $(zmq_packages)
 
-protobuf_packages_$(PROTOBUF) = $(protobuf_packages)
 rapidcheck_packages_$(RAPIDCHECK) = $(rapidcheck_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)
 
-ifeq ($(protobuf_packages_),)
-native_packages += $(protobuf_native_packages)
-packages += $(protobuf_packages)
-endif
-
 ifneq ($(zmq_packages_),)
 packages += $(zmq_packages)
 endif
@@ -157,7 +150,6 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
             -e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \
             -e 's|@no_qt@|$(NO_QT)|' \
             -e 's|@no_zmq@|$(NO_ZMQ)|' \
-            -e 's|@enable_bip70@|$(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
@@ -77,7 +77,6 @@ The following can be set when running make: make FOO=bar
     NO_UPNP: Don't download/build/cache packages needed for enabling upnp
     DEBUG: disable some optimizations and enable more runtime checking
     RAPIDCHECK: build rapidcheck (experimental, requires cmake)
-    PROTOBUF: build protobuf (used for deprecated BIP70 support)
     HOST_ID_SALT: Optional salt to use when generating host package ids
     BUILD_ID_SALT: Optional salt to use when generating build package ids
 
diff --git a/depends/config.site.in b/depends/config.site.in
@@ -16,10 +16,6 @@ fi
 if test -z $with_qt_bindir && test -z "@no_qt@"; then
   with_qt_bindir=$depends_prefix/native/bin
 fi
-if test -z $with_protoc_bindir && test -z "@no_qt@"; then
-  with_protoc_bindir=$depends_prefix/native/bin
-fi
-
 
 if test -z $enable_wallet && test -n "@no_wallet@"; then
   enable_wallet=no
@@ -37,10 +33,6 @@ if test -z $enable_zmq && test -n "@no_zmq@"; then
   enable_zmq=no
 fi
 
-if test -n $enable_bip70 && test -n "@enable_bip70@"; then
-  enable_bip70=yes
-fi
-
 if test x@host_os@ = xdarwin; then
   BREW=no
   PORT=no
diff --git a/depends/packages/native_protobuf.mk b/depends/packages/native_protobuf.mk
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
@@ -1,8 +1,5 @@
 packages:=boost openssl libevent
 
-protobuf_native_packages = native_protobuf
-protobuf_packages = protobuf
-
 qt_packages = qrencode zlib
 
 qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig
diff --git a/depends/packages/protobuf.mk b/depends/packages/protobuf.mk
