Skip to content

Commit ac918c7

Browse files
committed
Merge bitcoin/bitcoin#31552: depends: Update capnproto to 1.1.0
b0b8d96 depends: Update capnproto to 1.1.0 (Hennadii Stepanov) Pull request description: This change fixes compilation on NetBSD with GCC 14: ``` $ gmake -C depends capnp MULTIPROCESS=1 CC=/usr/pkg/gcc14/bin/gcc CXX=/usr/pkg/gcc14/bin/g++ gmake: Entering directory '/home/hebasto/dev/bitcoin/depends' <snip> In file included from /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/capnp/1.0.2-ffdefffd9f5/src/kj/memory.h:24, from /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/capnp/1.0.2-ffdefffd9f5/src/kj/exception.h:24, from /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/capnp/1.0.2-ffdefffd9f5/src/kj/async-prelude.h:27, from /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/capnp/1.0.2-ffdefffd9f5/src/kj/async.h:24, from /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/capnp/1.0.2-ffdefffd9f5/src/kj/async-io.h:24, from /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/capnp/1.0.2-ffdefffd9f5/src/kj/async-io-unix.c++:35: /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/capnp/1.0.2-ffdefffd9f5/src/kj/async-io-unix.c++: In lambda function: /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/capnp/1.0.2-ffdefffd9f5/src/kj/async-io-unix.c++:1243:24: error: 'AI_V4MAPPED' was not declared in this scope 1243 | hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG; | ^~~~~~~~~~~ gmake[3]: *** [src/kj/CMakeFiles/kj-async.dir/build.make:146: src/kj/CMakeFiles/kj-async.dir/async-io-unix.c++.o] Error 1 gmake[2]: *** [CMakeFiles/Makefile2:203: src/kj/CMakeFiles/kj-async.dir/all] Error 2 gmake[1]: *** [Makefile:136: all] Error 2 gmake[1]: Leaving directory '/home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/capnp/1.0.2-ffdefffd9f5' gmake: *** [funcs.mk:302: /home/hebasto/dev/bitcoin/depends/work/build/x86_64-unknown-netbsd10.0/capnp/1.0.2-ffdefffd9f5/./.stamp_built] Error 2 gmake: Leaving directory '/home/hebasto/dev/bitcoin/depends' ``` See: capnproto/capnproto@ccaa1f8. However, the other changes between [`v1.0.2`](https://github.com/capnproto/capnproto/releases/tag/v1.0.2) and [`v1.1.0`](https://github.com/capnproto/capnproto/releases/tag/v1.1.0) require a sanity check. ACKs for top commit: hodlinator: cr-ACK b0b8d96 Tree-SHA512: bb3ee29a609fd452f07fe8a67859d5bc4f0570e6b0f8245a5fe7576caa328220f94565b410757f727d0076a13916ce6b1c0243627b5c509ec4e0d90f1e28d673
2 parents a0f0c48 + b0b8d96 commit ac918c7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

depends/packages/native_capnp.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package=native_capnp
2-
$(package)_version=1.0.2
2+
$(package)_version=1.1.0
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=9057dbc0223366b74bbeca33a05de164a229b0377927f1b7ef3828cdd8cb1d7e
6+
$(package)_sha256_hash=07167580e563f5e821e3b2af1c238c16ec7181612650c5901330fa9a0da50939
77

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

0 commit comments

Comments
 (0)