-
Notifications
You must be signed in to change notification settings - Fork 36.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
build: Include native_X.mk before X.mk #23673
Conversation
Guix builds:
|
Guix hashes, mine match @hebasto:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Concept ACK
This also fixes other weirdness like:
# master
gmake --no-print-directory -C depends print-capnp_dependencies MULTIPROCESS=1
capnp_dependencies=native_native_capnp
# this PR
gmake --no-print-directory -C depends print-capnp_dependencies MULTIPROCESS=1
capnp_dependencies=native_capnp
This change fixes some weirdness like `make print-capnp_version` output in depends.
980a9df
to
ef77549
Compare
Updated 980a9df -> ef77549 (pr23673.01 -> pr23673.02): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
tACK ef77549
Tested on macOS 12.0.1
Currently, on master (d5724b8)
$ make --no-print-directory -C depends print-capnp_version MULTIPROCESS=1
capnp_version=
After this patch
$ make --no-print-directory -C depends print-capnp_version MULTIPROCESS=1
capnp_version=0.7.0
Also tested the weirdness fanquake pointed out above.
Master
$ make --no-print-directory -C depends print-capnp_dependencies MULTIPROCESS=1
capnp_dependencies=native_native_capnp
This patch
$ make --no-print-directory -C depends print-capnp_dependencies MULTIPROCESS=1
capnp_dependencies=native_capnp
Guix builds:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK ef77549
Guix build:
3895e9c0877221d48d0c4c601a70f8568656190a98bc16852484c255909db98a guix-build-ef77549000ac/output/aarch64-linux-gnu/SHA256SUMS.part
e08470526151885152d45f521309d50049639ff350ffbc6f3509ea86be0e391c guix-build-ef77549000ac/output/aarch64-linux-gnu/bitcoin-ef77549000ac-aarch64-linux-gnu-debug.tar.gz
4a4f0ff43840acf9e563086c368f60cf7ead50d91357b0a6474cbfe5954870b4 guix-build-ef77549000ac/output/aarch64-linux-gnu/bitcoin-ef77549000ac-aarch64-linux-gnu.tar.gz
16a0145e0e787f16f26e68320074a52045338a90ee12ec83aaca6a99c0eb7681 guix-build-ef77549000ac/output/arm-linux-gnueabihf/SHA256SUMS.part
10a7aef5accffa67829ecd015ec8f52aa5907641cf4d60bcf29fd20e93418227 guix-build-ef77549000ac/output/arm-linux-gnueabihf/bitcoin-ef77549000ac-arm-linux-gnueabihf-debug.tar.gz
8ced201f710f4913fdff36061dbe01c7fc64a0dc97f92c00b22e512c09125fd9 guix-build-ef77549000ac/output/arm-linux-gnueabihf/bitcoin-ef77549000ac-arm-linux-gnueabihf.tar.gz
d50770610865e6978efc6e6c60e81358b88bf560872ba30bbe9c200cf2c4c618 guix-build-ef77549000ac/output/dist-archive/bitcoin-ef77549000ac.tar.gz
2fed92dc00eb5a96817ca955171fb1b9d18fe8d9ad67999568f1eac4e1e16279 guix-build-ef77549000ac/output/powerpc64-linux-gnu/SHA256SUMS.part
80b16d5cf1d4f5ee4aa8072b7c003f412236a0517feee5933afc768a8b21d4c2 guix-build-ef77549000ac/output/powerpc64-linux-gnu/bitcoin-ef77549000ac-powerpc64-linux-gnu-debug.tar.gz
b15ffbd4533bbc4f9411b749e0ca3938318369c4cfc61d7d28d03b09b3ac7373 guix-build-ef77549000ac/output/powerpc64-linux-gnu/bitcoin-ef77549000ac-powerpc64-linux-gnu.tar.gz
96665ee949e487170bf2cdb98caea3d530e8b922f9a9420ea222b0abda1a1754 guix-build-ef77549000ac/output/powerpc64le-linux-gnu/SHA256SUMS.part
d7177210324ed92d6c35b615b8614b07b31f2a3ce543da55034e3bc680d24abb guix-build-ef77549000ac/output/powerpc64le-linux-gnu/bitcoin-ef77549000ac-powerpc64le-linux-gnu-debug.tar.gz
934cad3c42f1029e1f7f1f4b0a888b1d266ada67fa571b847a6d3c29ff894fa3 guix-build-ef77549000ac/output/powerpc64le-linux-gnu/bitcoin-ef77549000ac-powerpc64le-linux-gnu.tar.gz
28df25c8dcd46177da706c43ebf272201aec36fdd93cbd73fade71e52851140f guix-build-ef77549000ac/output/riscv64-linux-gnu/SHA256SUMS.part
bc72438937da78740fbc364d4c1102b3821d2c686ba4bc188001fcf7a3ca2b98 guix-build-ef77549000ac/output/riscv64-linux-gnu/bitcoin-ef77549000ac-riscv64-linux-gnu-debug.tar.gz
fbadeffc83e3dbb31a702e1406616469c5ad84aa70a34ca5b908fa680d7348f4 guix-build-ef77549000ac/output/riscv64-linux-gnu/bitcoin-ef77549000ac-riscv64-linux-gnu.tar.gz
acfdefec7ac276ba7bac88982a4200dc976263831a8581c87c00eef1a87a6c4f guix-build-ef77549000ac/output/x86_64-apple-darwin/SHA256SUMS.part
237d290ef473736bf22e23f29fe277770497c39c9e36908b2816e3ce8dad2822 guix-build-ef77549000ac/output/x86_64-apple-darwin/bitcoin-ef77549000ac-osx-unsigned.dmg
2bb6412ab793538f39aa73d5bb868a6b85da85d387eb672652d88ae7d7b18d26 guix-build-ef77549000ac/output/x86_64-apple-darwin/bitcoin-ef77549000ac-osx-unsigned.tar.gz
605402a386e4444fe31fa70cc79096e4da446310616ad5b108afebfdec43fbf2 guix-build-ef77549000ac/output/x86_64-apple-darwin/bitcoin-ef77549000ac-osx64.tar.gz
a5e752f3b796841a2edac7621c290b6deec4d2a19a4ec02a428ed797143262ba guix-build-ef77549000ac/output/x86_64-linux-gnu/SHA256SUMS.part
cf87bbbb54d1fb85f21e02f3c99e0fc54a787a2b7aba1a248ea06af16ed26f57 guix-build-ef77549000ac/output/x86_64-linux-gnu/bitcoin-ef77549000ac-x86_64-linux-gnu-debug.tar.gz
088488e2ad215d5462ae65e48b14dd104fc9d8b46420aed045c2f86c63a15e28 guix-build-ef77549000ac/output/x86_64-linux-gnu/bitcoin-ef77549000ac-x86_64-linux-gnu.tar.gz
a489b8c89e2215ba3b747d6d46bccd84b98e99b0fedcae717eb4d1e83c5a1c9d guix-build-ef77549000ac/output/x86_64-w64-mingw32/SHA256SUMS.part
58307ce68de87d54df983e528df6c1ce38ed6245978b05a2517a5b06e4fb0455 guix-build-ef77549000ac/output/x86_64-w64-mingw32/bitcoin-ef77549000ac-win-unsigned.tar.gz
48486afba892e0cb5995110e206caaddb16e920af9333c8d9e9bb72687674c01 guix-build-ef77549000ac/output/x86_64-w64-mingw32/bitcoin-ef77549000ac-win64-debug.zip
c408ec8aa64d637d295c852aefb572a148edcf997dba7c452bf0ee0bc3ce4d33 guix-build-ef77549000ac/output/x86_64-w64-mingw32/bitcoin-ef77549000ac-win64-setup-unsigned.exe
431a7d8746904a076e851ccb6a82831a350420c24376c5ea0ac2aca7a30685ca guix-build-ef77549000ac/output/x86_64-w64-mingw32/bitcoin-ef77549000ac-win64.zip
The depends build system improvements are continued in #22552. 🐅 |
ef77549 build: Include native_X.mk before X.mk (Hennadii Stepanov) Pull request description: Unfortunately, our depends build system still lacks 100% reliability. On master (57982f4): ``` $ 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#22552, bitcoin#22555 and bitcoin#22708. ACKs for top commit: Zero-1729: tACK ef77549 fanquake: ACK ef77549 Tree-SHA512: 9818277c82fcef778282a9fe854e48c6b6118cc757fcffa6fd4a2418e3de8b2a2b9d54e31804d22a53b28a28ffa5b8610c983add1969be0c4b3e13e0f2267271
e4a4d20 build: Include native_X.mk before X.mk (Hennadii Stepanov) Pull request description: Unfortunately, our depends build system still lacks 100% reliability. On master (864e339): ``` $ 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 e4a4d20 fanquake: ACK e4a4d20 Tree-SHA512: 9818277c82fcef778282a9fe854e48c6b6118cc757fcffa6fd4a2418e3de8b2a2b9d54e31804d22a53b28a28ffa5b8610c983add1969be0c4b3e13e0f2267271
ef77549 build: Include native_X.mk before X.mk (Hennadii Stepanov) Pull request description: Unfortunately, our depends build system still lacks 100% reliability. On master (57982f4): ``` $ 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#22552, bitcoin#22555 and bitcoin#22708. ACKs for top commit: Zero-1729: tACK ef77549 fanquake: ACK ef77549 Tree-SHA512: 9818277c82fcef778282a9fe854e48c6b6118cc757fcffa6fd4a2418e3de8b2a2b9d54e31804d22a53b28a28ffa5b8610c983add1969be0c4b3e13e0f2267271
ef77549 build: Include native_X.mk before X.mk (Hennadii Stepanov) Pull request description: Unfortunately, our depends build system still lacks 100% reliability. On master (57982f4): ``` $ 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#22552, bitcoin#22555 and bitcoin#22708. ACKs for top commit: Zero-1729: tACK ef77549 fanquake: ACK ef77549 Tree-SHA512: 9818277c82fcef778282a9fe854e48c6b6118cc757fcffa6fd4a2418e3de8b2a2b9d54e31804d22a53b28a28ffa5b8610c983add1969be0c4b3e13e0f2267271
ef77549 build: Include native_X.mk before X.mk (Hennadii Stepanov) Pull request description: Unfortunately, our depends build system still lacks 100% reliability. On master (57982f4): ``` $ 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#22552, bitcoin#22555 and bitcoin#22708. ACKs for top commit: Zero-1729: tACK ef77549 fanquake: ACK ef77549 Tree-SHA512: 9818277c82fcef778282a9fe854e48c6b6118cc757fcffa6fd4a2418e3de8b2a2b9d54e31804d22a53b28a28ffa5b8610c983add1969be0c4b3e13e0f2267271
ef77549 build: Include native_X.mk before X.mk (Hennadii Stepanov) Pull request description: Unfortunately, our depends build system still lacks 100% reliability. On master (57982f4): ``` $ 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#22552, bitcoin#22555 and bitcoin#22708. ACKs for top commit: Zero-1729: tACK ef77549 fanquake: ACK ef77549 Tree-SHA512: 9818277c82fcef778282a9fe854e48c6b6118cc757fcffa6fd4a2418e3de8b2a2b9d54e31804d22a53b28a28ffa5b8610c983add1969be0c4b3e13e0f2267271
Unfortunately, our depends build system still lacks 100% reliability.
On master (57982f4):
This PR fixes this issue:
This PR split off from #22552, #22555 and #22708.