From 95204d3fa0871cb0c1a52953282583329797620f Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 10 Dec 2021 20:55:29 +0800 Subject: [PATCH] Merge bitcoin/bitcoin#23673: build: Include native_X.mk before X.mk ef77549000ac46eededa3e4a89466024db111524 build: Include native_X.mk before X.mk (Hennadii Stepanov) Pull request description: Unfortunately, our depends build system still lacks 100% reliability. On master (57982f419e36d0023c83af2dd0d683ca3160dc2a): ``` $ make --no-print-directory -C depends print-capnp_version MULTIPROCESS=1 capnp_version= ``` This PR fixes this issue: ``` $ make --no-print-directory -C depends print-capnp_version MULTIPROCESS=1 capnp_version=0.7.0 ``` This PR split off from bitcoin/bitcoin#22552, bitcoin/bitcoin#22555 and bitcoin/bitcoin#22708. ACKs for top commit: Zero-1729: tACK ef77549000ac46eededa3e4a89466024db111524 fanquake: ACK ef77549000ac46eededa3e4a89466024db111524 Tree-SHA512: 9818277c82fcef778282a9fe854e48c6b6118cc757fcffa6fd4a2418e3de8b2a2b9d54e31804d22a53b28a28ffa5b8610c983add1969be0c4b3e13e0f2267271 --- depends/funcs.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/depends/funcs.mk b/depends/funcs.mk index 8891e17082..7c45d95838 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -244,7 +244,8 @@ $(foreach package,$(packages),$(eval $(package)_type=$(host_arch)_$(host_os))) $(foreach package,$(all_packages),$(eval $(call int_vars,$(package)))) #include package files -$(foreach package,$(all_packages),$(eval include packages/$(package).mk)) +$(foreach native_package,$(native_packages),$(eval include packages/$(native_package).mk)) +$(foreach package,$(packages),$(eval include packages/$(package).mk)) #compute a hash of all files that comprise this package's build recipe $(foreach package,$(all_packages),$(eval $(call int_get_build_recipe_hash,$(package))))