Skip to content

Commit 84890e0

Browse files
committed
Merge bitcoin#31484: depends: update capnproto to 1.0.2
5cd9e95 depends: update capnproto to 1.0.2 (fanquake) Pull request description: This fixes compilation on FreeBSD: ```bash -- Build files have been written to: /tmp/cirrus-ci-build/bitcoin-core/depends/work/build/x86_64-unknown-freebsd14.0/native_capnp/1.0.1-867405dd2c4 Building native_capnp... gmake[1]: Entering directory '/tmp/cirrus-ci-build/bitcoin-core/depends/work/build/x86_64-unknown-freebsd14.0/native_capnp/1.0.1-867405dd2c4' [ 1%] Building CXX object src/kj/CMakeFiles/kj.dir/array.c++.o [ 2%] Building CXX object src/kj/CMakeFiles/kj.dir/cidr.c++.o /tmp/cirrus-ci-build/bitcoin-core/depends/work/build/x86_64-unknown-freebsd14.0/native_capnp/1.0.1-867405dd2c4/src/kj/cidr.c++:112:71: error: member access into incomplete type 'const struct sockaddr_in6' otherBits = reinterpret_cast<const struct sockaddr_in6*>(addr)->sin6_addr.s6_addr; ^ /tmp/cirrus-ci-build/bitcoin-core/depends/work/build/x86_64-unknown-freebsd14.0/native_capnp/1.0.1-867405dd2c4/src/kj/cidr.c++:112:51: note: forward declaration of 'sockaddr_in6' otherBits = reinterpret_cast<const struct sockaddr_in6*>(addr)->sin6_addr.s6_addr; ^ /tmp/cirrus-ci-build/bitcoin-core/depends/work/build/x86_64-unknown-freebsd14.0/native_capnp/1.0.1-867405dd2c4/src/kj/cidr.c++:123:63: error: member access into incomplete type 'const struct sockaddr_in' &reinterpret_cast<const struct sockaddr_in*>(addr)->sin_addr.s_addr); ^ /tmp/cirrus-ci-build/bitcoin-core/depends/work/build/x86_64-unknown-freebsd14.0/native_capnp/1.0.1-867405dd2c4/src/kj/cidr.c++:123:44: note: forward declaration of 'sockaddr_in' &reinterpret_cast<const struct sockaddr_in*>(addr)->sin_addr.s_addr); ^ /tmp/cirrus-ci-build/bitcoin-core/depends/work/build/x86_64-unknown-freebsd14.0/native_capnp/1.0.1-867405dd2c4/src/kj/cidr.c++:133:69: error: member access into incomplete type 'const struct sockaddr_in6' otherBits = reinterpret_cast<const struct sockaddr_in6*>(addr)->sin6_addr.s6_addr; ^ /tmp/cirrus-ci-build/bitcoin-core/depends/work/build/x86_64-unknown-freebsd14.0/native_capnp/1.0.1-867405dd2c4/src/kj/cidr.c++:133:49: note: forward declaration of 'sockaddr_in6' otherBits = reinterpret_cast<const struct sockaddr_in6*>(addr)->sin6_addr.s6_addr; ^ 3 errors generated. ``` See: capnproto/capnproto@1c19c36. ACKs for top commit: kevkevinpal: Concept ACK [5cd9e95](bitcoin@5cd9e95) theuni: utACK 5cd9e95 ryanofsky: Code review ACK 5cd9e95. Downloaded the file and checked the hash. Also followed theuni's lead and looked at the source changes which were very minor. It did look like thousands of lines changed in the autotools build, but this should not affect us as we are using the cmake build. Tree-SHA512: 5d78887a9e950c8532c427b17969128de0c6d466ec5ffba85241457e8e19673c22ddb3493cdfce5086f57ba760eac5e91f703992b2f70f2a7c82ba885255279c
2 parents d5ab5a4 + 5cd9e95 commit 84890e0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

depends/packages/native_capnp.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package=native_capnp
2-
$(package)_version=1.0.1
2+
$(package)_version=1.0.2
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=0f7f4b8a76a2cdb284fddef20de8306450df6dd031a47a15ac95bc43c3358e09
6+
$(package)_sha256_hash=9057dbc0223366b74bbeca33a05de164a229b0377927f1b7ef3828cdd8cb1d7e
77

88
define $(package)_set_vars
99
$(package)_config_opts := -DBUILD_TESTING=OFF

0 commit comments

Comments
 (0)