Skip to content

Commit d630646

Browse files
ryanofskyryanofsky
committed
libmultiprocess depends build
1 parent e6e44ee commit d630646

File tree

11 files changed

+105
-1
lines changed

11 files changed

+105
-1
lines changed

‎depends/Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ NO_QR ?=
1313
NO_WALLET ?=
1414
NO_ZMQ ?=
1515
NO_UPNP ?=
16+
MULTIPROCESS ?=
1617
FALLBACK_DOWNLOAD_PATH ?= https://bitcoincore.org/depends-sources
1718

1819
BUILD = $(shell ./config.guess)
@@ -107,6 +108,7 @@ qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch
107108
wallet_packages_$(NO_WALLET) = $(wallet_packages)
108109
upnp_packages_$(NO_UPNP) = $(upnp_packages)
109110
zmq_packages_$(NO_ZMQ) = $(zmq_packages)
111+
multiprocess_packages_$(MULTIPROCESS) = $(multiprocess_packages)
110112

111113
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(wallet_packages_) $(upnp_packages_)
112114
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
@@ -115,6 +117,11 @@ ifneq ($(zmq_packages_),)
115117
packages += $(zmq_packages)
116118
endif
117119

120+
ifeq ($(multiprocess_packages_),)
121+
packages += $(multiprocess_packages)
122+
native_packages += $(multiprocess_native_packages)
123+
endif
124+
118125
all_packages = $(packages) $(native_packages)
119126

120127
meta_depends = Makefile funcs.mk builders/default.mk hosts/default.mk hosts/$(host_os).mk builders/$(build_os).mk
@@ -155,6 +162,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
155162
-e 's|@no_zmq@|$(NO_ZMQ)|' \
156163
-e 's|@no_wallet@|$(NO_WALLET)|' \
157164
-e 's|@no_upnp@|$(NO_UPNP)|' \
165+
-e 's|@multiprocess@|$(MULTIPROCESS)|' \
158166
-e 's|@debug@|$(DEBUG)|' \
159167
$< > $@
160168
$(AT)touch $@

‎depends/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ The following can be set when running make: make FOO=bar
9191
NO_ZMQ: Don't download/build/cache packages needed for enabling zeromq
9292
NO_WALLET: Don't download/build/cache libs needed to enable the wallet
9393
NO_UPNP: Don't download/build/cache packages needed for enabling upnp
94+
MULTIPROCESS: build libmultiprocess (experimental, requires cmake)
9495
DEBUG: disable some optimizations and enable more runtime checking
9596
HOST_ID_SALT: Optional salt to use when generating host package ids
9697
BUILD_ID_SALT: Optional salt to use when generating build package ids

‎depends/config.site.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ fi
1616
if test -z $with_qt_bindir && test -z "@no_qt@"; then
1717
with_qt_bindir=$depends_prefix/native/bin
1818
fi
19+
if test -z $with_mpgen && test -n "@multiprocess@"; then
20+
with_mpgen=$depends_prefix/native
21+
fi
1922

2023
if test -z $with_qrencode && test -n "@no_qr@"; then
2124
with_qrencode=no
@@ -25,6 +28,10 @@ if test -z $enable_wallet && test -n "@no_wallet@"; then
2528
enable_wallet=no
2629
fi
2730

31+
if test -z $enable_multiprocess && test -n "@multiprocess@"; then
32+
enable_multiprocess=yes
33+
fi
34+
2835
if test -z $with_miniupnpc && test -n "@no_upnp@"; then
2936
with_miniupnpc=no
3037
fi

‎depends/funcs.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ $(1)_config_env+=$($(1)_config_env_$(host_arch)_$(host_os)) $($(1)_config_env_$(
130130

131131
$(1)_config_env+=PKG_CONFIG_LIBDIR=$($($(1)_type)_prefix)/lib/pkgconfig
132132
$(1)_config_env+=PKG_CONFIG_PATH=$($($(1)_type)_prefix)/share/pkgconfig
133+
$(1)_config_env+=CMAKE_MODULE_PATH=$($($(1)_type)_prefix)/lib/cmake
133134
$(1)_config_env+=PATH=$(build_prefix)/bin:$(PATH)
134135
$(1)_build_env+=PATH=$(build_prefix)/bin:$(PATH)
135136
$(1)_stage_env+=PATH=$(build_prefix)/bin:$(PATH)

‎depends/packages/boost.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package=boost
22
$(package)_version=1_70_0
33
$(package)_download_path=https://dl.bintray.com/boostorg/release/1.70.0/source/
4-
$(package)_file_name=$(package)_$($(package)_version).tar.bz2
4+
$(package)_file_name=boost_$($(package)_version).tar.bz2
55
$(package)_sha256_hash=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778
66

77
define $(package)_set_vars

‎depends/packages/capnp.mk

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package=capnp
2+
$(package)_version=$(native_$(package)_version)
3+
$(package)_download_path=$(native_$(package)_download_path)
4+
$(package)_file_name=$(native_$(package)_file_name)
5+
$(package)_sha256_hash=$(native_$(package)_sha256_hash)
6+
7+
define $(package)_config_cmds
8+
$($(package)_autoconf)
9+
endef
10+
11+
define $(package)_build_cmds
12+
$(MAKE)
13+
endef
14+
15+
define $(package)_stage_cmds
16+
$(MAKE) DESTDIR=$($(package)_staging_dir) install
17+
endef

‎depends/packages/libmultiprocess.mk

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package=libmultiprocess
2+
$(package)_version=$(native_$(package)_version)
3+
$(package)_download_path=$(native_$(package)_download_path)
4+
$(package)_file_name=$(native_$(package)_file_name)
5+
$(package)_sha256_hash=$(native_$(package)_sha256_hash)
6+
$(package)_dependencies=native_$(package) boost capnp
7+
8+
define $(package)_config_cmds
9+
cmake -DCMAKE_INSTALL_PREFIX=$($($(package)_type)_prefix)
10+
endef
11+
12+
define $(package)_build_cmds
13+
$(MAKE)
14+
endef
15+
16+
define $(package)_stage_cmds
17+
$(MAKE) DESTDIR=$($(package)_staging_dir) install
18+
endef

‎depends/packages/native_boost.mk

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package=native_boost
2+
$(package)_version=$(boost_version)
3+
$(package)_download_path=$(boost_download_path)
4+
$(package)_file_name=$(boost_file_name)
5+
$(package)_sha256_hash=$(boost_sha256_hash)
6+
7+
define $(package)_config_cmds
8+
./bootstrap.sh --prefix=$($($(package)_type)_prefix) --with-libraries=headers
9+
endef
10+
11+
define $(package)_stage_cmds
12+
./b2 -d0 --prefix=$($(package)_staging_prefix_dir) install
13+
endef

‎depends/packages/native_capnp.mk

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package=native_capnp
2+
$(package)_version=0.7.0
3+
$(package)_download_path=https://capnproto.org/
4+
$(package)_download_file=capnproto-c++-$($(package)_version).tar.gz
5+
$(package)_file_name=capnproto-cxx-$($(package)_version).tar.gz
6+
$(package)_sha256_hash=c9a4c0bd88123064d483ab46ecee777f14d933359e23bff6fb4f4dbd28b4cd41
7+
8+
define $(package)_config_cmds
9+
$($(package)_autoconf)
10+
endef
11+
12+
define $(package)_build_cmds
13+
$(MAKE)
14+
endef
15+
16+
define $(package)_stage_cmds
17+
$(MAKE) DESTDIR=$($(package)_staging_dir) install
18+
endef

‎depends/packages/native_libmultiprocess.mk

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package=native_libmultiprocess
2+
$(package)_version=1d630f536d43d1fdba028f2cfccf49bc27da92db
3+
$(package)_download_path=https://github.com/chaincodelabs/libmultiprocess/archive
4+
$(package)_file_name=$($(package)_version).tar.gz
5+
$(package)_sha256_hash=f43183ccf59fa7596d113e56518563673f5823a721974b4058d8778ef53bd476
6+
$(package)_dependencies=native_boost native_capnp
7+
8+
define $(package)_config_cmds
9+
cmake -DCMAKE_INSTALL_PREFIX=$($($(package)_type)_prefix)
10+
endef
11+
12+
define $(package)_build_cmds
13+
$(MAKE)
14+
endef
15+
16+
define $(package)_stage_cmds
17+
$(MAKE) DESTDIR=$($(package)_staging_dir) install
18+
endef

0 commit comments

Comments
 (0)