Skip to content

Commit 953d302

Browse files
committed
Merge bitcoin/bitcoin#28735: depends: Bump to capnproto-c++-1.0.1
3333f14 depends: Bump to capnproto-c++-1.0.1 (MarcoFalke) Pull request description: Reasons: * Debian is starting to ship this version in Trixie (https://packages.debian.org/trixie/capnproto), which will likely become the version shipped with Ubuntu 24.04 LTS. So testing with this version will help to find any issues before real users start to use those distro packages. * The feature is currently experimental, so bumping the version shouldn't cause any production issues. * With multiprocess begin a priority project for 27.0, it seems better to do build system changes/bumps early, rather than later, to allow for more time testing them. ACKs for top commit: TheCharlatan: Re-ACK 3333f14 fanquake: ACK 3333f14 - the response from upstream is that [if we submit a PR, they can take a look](capnproto/capnproto#1833 (comment)), so if anyone would like this to work for Windows, I'd suggest sending a patch. ryanofsky: Code review ACK 3333f14 Tree-SHA512: 7d53ad1536f042ab43dbc7847126b826e7fc76694f173c348b835fd1067b8f3dd682c5bcb4887f09ee85bab69130721cd7f8fb96b2e82053d4e28bd5c38bdc5f
2 parents d2d53b4 + 3333f14 commit 953d302

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

ci/test/00_setup_env_i686_multiprocess.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2020-2022 The Bitcoin Core developers
3+
# Copyright (c) 2020-present The Bitcoin Core developers
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

@@ -15,3 +15,4 @@ 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/capnp.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ $(package)_dependencies=native_$(package)
88

99
define $(package)_set_vars :=
1010
$(package)_config_opts := --with-external-capnp
11+
$(package)_config_opts += --without-openssl
1112
$(package)_config_opts += CAPNP="$$(native_capnp_prefixbin)/capnp"
1213
$(package)_config_opts += CAPNP_CXX="$$(native_capnp_prefixbin)/capnp-c++"
1314
$(package)_config_opts_android := --disable-shared

depends/packages/native_capnp.mk

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
package=native_capnp
2-
$(package)_version=0.7.0
2+
$(package)_version=1.0.1
33
$(package)_download_path=https://capnproto.org/
44
$(package)_download_file=capnproto-c++-$($(package)_version).tar.gz
55
$(package)_file_name=capnproto-cxx-$($(package)_version).tar.gz
6-
$(package)_sha256_hash=c9a4c0bd88123064d483ab46ecee777f14d933359e23bff6fb4f4dbd28b4cd41
6+
$(package)_sha256_hash=0f7f4b8a76a2cdb284fddef20de8306450df6dd031a47a15ac95bc43c3358e09
7+
8+
define $(package)_set_vars
9+
$(package)_config_opts = --without-openssl
10+
endef
711

812
define $(package)_config_cmds
913
$($(package)_autoconf)

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=1af83d15239ccfa7e47b8764029320953dd7fdf1
2+
$(package)_version=61d5a0e661f20a4928fbf868ec9c3c6f17883cc7
33
$(package)_download_path=https://github.com/chaincodelabs/libmultiprocess/archive
44
$(package)_file_name=$($(package)_version).tar.gz
5-
$(package)_sha256_hash=e5587d3feedc7f8473f178a89b94163a11076629825d664964799bbbd5844da5
5+
$(package)_sha256_hash=5cfda224cc2ce913f2493f843317e0fca3184f6d7c1434c9754b2e7dca440ab5
66
$(package)_dependencies=native_capnp
77

88
define $(package)_config_cmds

0 commit comments

Comments
 (0)