Skip to content

Commit a238356

Browse files
committed
Merge bitcoin/bitcoin#28907: depends: bump libmultiprocess to fix capnproto deprecation warnings
21bfee0 depends: bump libmultiprocess to fix capnproto deprecation warnings (Ryan Ofsky) Pull request description: This incorporates PR bitcoin-core/libmultiprocess#88 and reverts the NO_WERROR CI workaround added in #28735 Upstream diff: bitcoin-core/libmultiprocess@61d5a0e...414542f --- This PR is part of the [process separation project](bitcoin/bitcoin#28722). ACKs for top commit: maflcko: lgtm ACK 21bfee0 hebasto: ACK 21bfee0, I have reviewed the code and it looks OK. I've also skimmed through the related changes in the https://github.com/chaincodelabs/libmultiprocess repository. Tree-SHA512: b5addb0deed694eeec62a0ae08b4715a811110201f39f3e6cadee8fc4e6231b0e66c844a98512072a1445bac122ab561dc1711e27fb4d7ac5c08ac46780a4acf
2 parents 4374a87 + 21bfee0 commit a238356

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

ci/test/00_setup_env_i686_multiprocess.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ export GOAL="install"
1515
export BITCOIN_CONFIG="--enable-debug CC='clang -m32' CXX='clang++ -m32' \
1616
LDFLAGS='--rtlib=compiler-rt -lgcc_s' CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE'"
1717
export TEST_RUNNER_ENV="BITCOIND=bitcoin-node"
18-
export NO_WERROR=1 # Temporary workaround to avoid -Wdeprecated-declarations from KJ

depends/packages/native_libmultiprocess.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package=native_libmultiprocess
2-
$(package)_version=61d5a0e661f20a4928fbf868ec9c3c6f17883cc7
2+
$(package)_version=414542f81e0997354b45b8ade13ca144a3e35ff1
33
$(package)_download_path=https://github.com/chaincodelabs/libmultiprocess/archive
44
$(package)_file_name=$($(package)_version).tar.gz
5-
$(package)_sha256_hash=5cfda224cc2ce913f2493f843317e0fca3184f6d7c1434c9754b2e7dca440ab5
5+
$(package)_sha256_hash=8542dbaf8c4fce8fd7af6929f5dc9b34dffa51c43e9ee360e93ee0f34b180bc2
66
$(package)_dependencies=native_capnp
77

88
define $(package)_config_cmds

0 commit comments

Comments
 (0)