Skip to content

Commit c8092fb

Browse files
fanquakePastaPastaPasta
authored andcommitted
Merge bitcoin#25214: multiprocess build fix: ipc/capnp/init.capnp.h: No such file or directory
44904aa multiprocess build cleanup: comment on manual dependencies (Ryan Ofsky) 6e1c16c multiprocess build fix: ipc/capnp/init.capnp.h: No such file or directory (Ryan Ofsky) Pull request description: Error was reported by SatoriHoshiAiko in bitcoin#25207 and happens unpredictably because make doesn't always build dependencies in the same order. The source file `src/ipc/capnp/protocol.cpp` includes some generated headers so needs to have an explicit dependency specified in the makefile so the headers will be generated before the file is compiled. bitcoin#19160 added the explicit dependency, but it was incorrect because it referred to an old file path from before the source file was renamed (`ipc.cpp` -> `protocol.cpp`) ACKs for top commit: hebasto: re-ACK 44904aa Tree-SHA512: 578ef4ef35a97e9d8d4e6d4edf39e57a32674234bf145e8159268324cb6ba15b420517afc07f6f42bb11a562954ea74af686c3fb92ce178c1fc378421b352531
1 parent 1c40b5d commit c8092fb

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/Makefile.am

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ obj/build.h: FORCE
410410
"$(abs_top_srcdir)"
411411
libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
412412

413-
ipc/capnp/libbitcoin_ipc_a-ipc.$(OBJEXT): $(libbitcoin_ipc_mpgen_input:=.h)
414413

415414
# server: shared between dashd and dash-qt
416415
# Contains code accessing mempool and chain state that is meant to be separated
@@ -1015,6 +1014,10 @@ libbitcoin_ipc_mpgen_input = \
10151014
EXTRA_DIST += $(libbitcoin_ipc_mpgen_input)
10161015
%.capnp:
10171016

1017+
# Explicitly list dependencies on generated headers as described in
1018+
# https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html#Recording-Dependencies-manually
1019+
ipc/capnp/libbitcoin_ipc_a-protocol.$(OBJEXT): $(libbitcoin_ipc_mpgen_input:=.h)
1020+
10181021
if BUILD_MULTIPROCESS
10191022
LIBBITCOIN_IPC=libbitcoin_ipc.a
10201023
libbitcoin_ipc_a_SOURCES = \

0 commit comments

Comments
 (0)