From f29bd546ec169dd9af2ca6265c76353e68db92be Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 10 Apr 2020 19:36:19 -0400 Subject: Revert "Merge #16367: Multiprocess build support" This reverts the changes made in merge commit 1b307613604883daea4913a65da30ae073c9dc4d: This reverts commit b919efadff3d0393f4a8c3c1dc735f7ac5c665bb. This reverts commit d54f64c6c700be0604190f52c84fc5f1cdd9f02f. This reverts commit 787f40668dc15980c3d6de028d7950c08175d84a. This reverts commit d6306466626635e6fee44385e6a688c8dc118eb5. This reverts commit e6e44eedd56ecaf59f3fabf8e07ab7dee0ddb1b6. --- depends/Makefile | 8 -------- depends/README.md | 1 - depends/builders/darwin.mk | 4 ++-- depends/config.site.in | 7 ------- depends/funcs.mk | 1 - depends/packages/boost.mk | 2 +- depends/packages/capnp.mk | 17 ----------------- depends/packages/libmultiprocess.mk | 18 ------------------ depends/packages/native_boost.mk | 13 ------------- depends/packages/native_capnp.mk | 18 ------------------ depends/packages/native_libmultiprocess.mk | 18 ------------------ depends/packages/packages.mk | 3 --- 12 files changed, 3 insertions(+), 107 deletions(-) delete mode 100644 depends/packages/capnp.mk delete mode 100644 depends/packages/libmultiprocess.mk delete mode 100644 depends/packages/native_boost.mk delete mode 100644 depends/packages/native_capnp.mk delete mode 100644 depends/packages/native_libmultiprocess.mk (limited to 'depends') diff --git a/depends/Makefile b/depends/Makefile index 5ad82bb56a..5f5247f881 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -13,7 +13,6 @@ NO_QR ?= NO_WALLET ?= NO_ZMQ ?= NO_UPNP ?= -MULTIPROCESS ?= FALLBACK_DOWNLOAD_PATH ?= https://bitcoincore.org/depends-sources BUILD = $(shell ./config.guess) @@ -108,7 +107,6 @@ qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch wallet_packages_$(NO_WALLET) = $(wallet_packages) upnp_packages_$(NO_UPNP) = $(upnp_packages) zmq_packages_$(NO_ZMQ) = $(zmq_packages) -multiprocess_packages_$(MULTIPROCESS) = $(multiprocess_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) @@ -117,11 +115,6 @@ ifneq ($(zmq_packages_),) packages += $(zmq_packages) endif -ifeq ($(multiprocess_packages_),) -packages += $(multiprocess_packages) -native_packages += $(multiprocess_native_packages) -endif - all_packages = $(packages) $(native_packages) meta_depends = Makefile funcs.mk builders/default.mk hosts/default.mk hosts/$(host_os).mk builders/$(build_os).mk @@ -162,7 +155,6 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_ -e 's|@no_zmq@|$(NO_ZMQ)|' \ -e 's|@no_wallet@|$(NO_WALLET)|' \ -e 's|@no_upnp@|$(NO_UPNP)|' \ - -e 's|@multiprocess@|$(MULTIPROCESS)|' \ -e 's|@debug@|$(DEBUG)|' \ $< > $@ $(AT)touch $@ diff --git a/depends/README.md b/depends/README.md index c12ea8bcb3..79865ff011 100644 --- a/depends/README.md +++ b/depends/README.md @@ -91,7 +91,6 @@ The following can be set when running make: make FOO=bar NO_ZMQ: Don't download/build/cache packages needed for enabling zeromq NO_WALLET: Don't download/build/cache libs needed to enable the wallet NO_UPNP: Don't download/build/cache packages needed for enabling upnp - MULTIPROCESS: build libmultiprocess (experimental, requires cmake) DEBUG: disable some optimizations and enable more runtime checking 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/builders/darwin.mk b/depends/builders/darwin.mk index 9513b6c21c..eb587fca89 100644 --- a/depends/builders/darwin.mk +++ b/depends/builders/darwin.mk @@ -1,5 +1,5 @@ -build_darwin_CC:=clang -build_darwin_CXX:=clang++ +build_darwin_CC:=$(shell xcrun -f clang) +build_darwin_CXX:=$(shell xcrun -f clang++) build_darwin_AR:=$(shell xcrun -f ar) build_darwin_RANLIB:=$(shell xcrun -f ranlib) build_darwin_STRIP:=$(shell xcrun -f strip) diff --git a/depends/config.site.in b/depends/config.site.in index 103aa0d2ff..fb9bf713cc 100644 --- a/depends/config.site.in +++ b/depends/config.site.in @@ -16,9 +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_mpgen && test -n "@multiprocess@"; then - with_mpgen=$depends_prefix/native -fi if test -z $with_qrencode && test -n "@no_qr@"; then with_qrencode=no @@ -28,10 +25,6 @@ if test -z $enable_wallet && test -n "@no_wallet@"; then enable_wallet=no fi -if test -z $enable_multiprocess && test -n "@multiprocess@"; then - enable_multiprocess=yes -fi - if test -z $with_miniupnpc && test -n "@no_upnp@"; then with_miniupnpc=no fi diff --git a/depends/funcs.mk b/depends/funcs.mk index 23ad9b1302..a4434b5167 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -130,7 +130,6 @@ $(1)_config_env+=$($(1)_config_env_$(host_arch)_$(host_os)) $($(1)_config_env_$( $(1)_config_env+=PKG_CONFIG_LIBDIR=$($($(1)_type)_prefix)/lib/pkgconfig $(1)_config_env+=PKG_CONFIG_PATH=$($($(1)_type)_prefix)/share/pkgconfig -$(1)_config_env+=CMAKE_MODULE_PATH=$($($(1)_type)_prefix)/lib/cmake $(1)_config_env+=PATH=$(build_prefix)/bin:$(PATH) $(1)_build_env+=PATH=$(build_prefix)/bin:$(PATH) $(1)_stage_env+=PATH=$(build_prefix)/bin:$(PATH) diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 970c81041e..cbe4fe4d97 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -1,7 +1,7 @@ package=boost $(package)_version=1_70_0 $(package)_download_path=https://dl.bintray.com/boostorg/release/1.70.0/source/ -$(package)_file_name=boost_$($(package)_version).tar.bz2 +$(package)_file_name=$(package)_$($(package)_version).tar.bz2 $(package)_sha256_hash=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778 define $(package)_set_vars diff --git a/depends/packages/capnp.mk b/depends/packages/capnp.mk deleted file mode 100644 index 360cedd63f..0000000000 --- a/depends/packages/capnp.mk +++ /dev/null @@ -1,17 +0,0 @@ -package=capnp -$(package)_version=$(native_$(package)_version) -$(package)_download_path=$(native_$(package)_download_path) -$(package)_file_name=$(native_$(package)_file_name) -$(package)_sha256_hash=$(native_$(package)_sha256_hash) - -define $(package)_config_cmds - $($(package)_autoconf) -endef - -define $(package)_build_cmds - $(MAKE) -endef - -define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) install -endef diff --git a/depends/packages/libmultiprocess.mk b/depends/packages/libmultiprocess.mk deleted file mode 100644 index 91798f676a..0000000000 --- a/depends/packages/libmultiprocess.mk +++ /dev/null @@ -1,18 +0,0 @@ -package=libmultiprocess -$(package)_version=$(native_$(package)_version) -$(package)_download_path=$(native_$(package)_download_path) -$(package)_file_name=$(native_$(package)_file_name) -$(package)_sha256_hash=$(native_$(package)_sha256_hash) -$(package)_dependencies=native_$(package) boost capnp - -define $(package)_config_cmds - cmake -DCMAKE_INSTALL_PREFIX=$($($(package)_type)_prefix) -endef - -define $(package)_build_cmds - $(MAKE) -endef - -define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) install -endef diff --git a/depends/packages/native_boost.mk b/depends/packages/native_boost.mk deleted file mode 100644 index b9e6253772..0000000000 --- a/depends/packages/native_boost.mk +++ /dev/null @@ -1,13 +0,0 @@ -package=native_boost -$(package)_version=$(boost_version) -$(package)_download_path=$(boost_download_path) -$(package)_file_name=$(boost_file_name) -$(package)_sha256_hash=$(boost_sha256_hash) - -define $(package)_config_cmds - ./bootstrap.sh --prefix=$($($(package)_type)_prefix) --with-libraries=headers -endef - -define $(package)_stage_cmds - ./b2 -d0 --prefix=$($(package)_staging_prefix_dir) install -endef diff --git a/depends/packages/native_capnp.mk b/depends/packages/native_capnp.mk deleted file mode 100644 index ed5a6deee2..0000000000 --- a/depends/packages/native_capnp.mk +++ /dev/null @@ -1,18 +0,0 @@ -package=native_capnp -$(package)_version=0.7.0 -$(package)_download_path=https://capnproto.org/ -$(package)_download_file=capnproto-c++-$($(package)_version).tar.gz -$(package)_file_name=capnproto-cxx-$($(package)_version).tar.gz -$(package)_sha256_hash=c9a4c0bd88123064d483ab46ecee777f14d933359e23bff6fb4f4dbd28b4cd41 - -define $(package)_config_cmds - $($(package)_autoconf) -endef - -define $(package)_build_cmds - $(MAKE) -endef - -define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) install -endef diff --git a/depends/packages/native_libmultiprocess.mk b/depends/packages/native_libmultiprocess.mk deleted file mode 100644 index 94da1377a3..0000000000 --- a/depends/packages/native_libmultiprocess.mk +++ /dev/null @@ -1,18 +0,0 @@ -package=native_libmultiprocess -$(package)_version=1d630f536d43d1fdba028f2cfccf49bc27da92db -$(package)_download_path=https://github.com/chaincodelabs/libmultiprocess/archive -$(package)_file_name=$($(package)_version).tar.gz -$(package)_sha256_hash=f43183ccf59fa7596d113e56518563673f5823a721974b4058d8778ef53bd476 -$(package)_dependencies=native_boost native_capnp - -define $(package)_config_cmds - cmake -DCMAKE_INSTALL_PREFIX=$($($(package)_type)_prefix) -endef - -define $(package)_build_cmds - $(MAKE) -endef - -define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) install -endef diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 9c56d3e978..42dbaa77a6 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -16,9 +16,6 @@ zmq_packages=zeromq upnp_packages=miniupnpc -multiprocess_packages = libmultiprocess capnp -multiprocess_native_packages = native_libmultiprocess native_boost native_capnp - darwin_native_packages = native_biplist native_ds_store native_mac_alias ifneq ($(build_os),darwin) -- cgit v1.2.3