diff options
author | MarcoFalke <falke.marco@gmail.com> | 2020-04-10 19:36:19 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2020-04-10 19:38:21 -0400 |
commit | f29bd546ec169dd9af2ca6265c76353e68db92be (patch) | |
tree | 379e6393b3d573dc72df853abe6ee608adf32772 /depends/packages | |
parent | 1b307613604883daea4913a65da30ae073c9dc4d (diff) | |
download | bitcoin-f29bd546ec169dd9af2ca6265c76353e68db92be.tar.xz |
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.
Diffstat (limited to 'depends/packages')
-rw-r--r-- | depends/packages/boost.mk | 2 | ||||
-rw-r--r-- | depends/packages/capnp.mk | 17 | ||||
-rw-r--r-- | depends/packages/libmultiprocess.mk | 18 | ||||
-rw-r--r-- | depends/packages/native_boost.mk | 13 | ||||
-rw-r--r-- | depends/packages/native_capnp.mk | 18 | ||||
-rw-r--r-- | depends/packages/native_libmultiprocess.mk | 18 | ||||
-rw-r--r-- | depends/packages/packages.mk | 3 |
7 files changed, 1 insertions, 88 deletions
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) |