Skip to content
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

contrib: use ENV flags in get_arch #30074

Merged
merged 2 commits into from May 15, 2024
Merged

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented May 9, 2024

This isn't an issue right now (because the get_arch check is simple), but becomes one as soon as we want to use lld for linking, and need LDFLAGS (otherwise we call ld and fail, see it's usage in #21778). So I've split this out for review. It also makes sense to use the same flags for all compilation in these checks.

Also drops some dead code in test-symbol-check.

@DrahtBot
Copy link
Contributor

DrahtBot commented May 9, 2024

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK TheCharlatan

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@DrahtBot
Copy link
Contributor

Guix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]

File commit ceb1e07
(master)
commit 635753a
(master and this pull)
SHA256SUMS.part 0d3f2df6d0d82d16... d4cc2d19cd1362d5...
*-aarch64-linux-gnu-debug.tar.gz 6cabb80fb73134f2... c9df4ca66d6c698f...
*-aarch64-linux-gnu.tar.gz 2daed9464982e987... 50be689b9f197330...
*-arm-linux-gnueabihf-debug.tar.gz 2bc7c3b446a72adb... 99d4f6b6982d9c22...
*-arm-linux-gnueabihf.tar.gz a3aea09c67eb4e75... 08b289cf7bffaa77...
*-arm64-apple-darwin-unsigned.tar.gz 38e1f3be896f6dba... 668c6942ca8353a2...
*-arm64-apple-darwin-unsigned.zip 83099989d2c8cd75... d2a043fa4098a2be...
*-arm64-apple-darwin.tar.gz 9b1115b3e6f12d94... a1cedb538561ca61...
*-powerpc64-linux-gnu-debug.tar.gz fdba5df1bb60516b... 89a14195d8f81d0e...
*-powerpc64-linux-gnu.tar.gz 3025d8c8e05256fc... 16d19071741f39ee...
*-riscv64-linux-gnu-debug.tar.gz 7e663ade407ca923... 99bbee18253c5e92...
*-riscv64-linux-gnu.tar.gz 4e6884787e8e505a... be24691a57612bda...
*-x86_64-apple-darwin-unsigned.tar.gz a56351782c789ed6... 2d8ecea2dff74e90...
*-x86_64-apple-darwin-unsigned.zip c171b912a9494622... 519988a0e7ff431f...
*-x86_64-apple-darwin.tar.gz f7f4284984349370... 05126bc6bdde7078...
*-x86_64-linux-gnu-debug.tar.gz fe60527ac92b9dad... 85fc5afad2b38990...
*-x86_64-linux-gnu.tar.gz eea0259e2f294eaa... 7725d8020e05d75d...
*.tar.gz 2ffc52da14b707a6... 00b10eacd31032c7...
guix_build.log 3877dc10bfbce9b7... c18dade2f59e0462...
guix_build.log.diff 7455825b419ac853...

@fanquake
Copy link
Member Author

Guix Build (aarch64):

fcb75f2a3b61befeabe143301e5db490d23b1ee4a5edb109f219dea575395b49  guix-build-b59a027d957a/output/aarch64-linux-gnu/SHA256SUMS.part
15310e3aff2a9ef71bad06315fcd425e56611d5bed7f6c394f3fe2248140e17b  guix-build-b59a027d957a/output/aarch64-linux-gnu/bitcoin-b59a027d957a-aarch64-linux-gnu-debug.tar.gz
8e60146d39a47e9c332e3b842e239f1ca7773ca2e6788876155377f4568ab1fa  guix-build-b59a027d957a/output/aarch64-linux-gnu/bitcoin-b59a027d957a-aarch64-linux-gnu.tar.gz
10432256ead82aa9f6c6434eab427b2da70d7c17353274abd09dbde74380bfcc  guix-build-b59a027d957a/output/arm-linux-gnueabihf/SHA256SUMS.part
96c131400a038434f5338926d72c62d7fa260daf3dde9966c7d7880a182b0b6e  guix-build-b59a027d957a/output/arm-linux-gnueabihf/bitcoin-b59a027d957a-arm-linux-gnueabihf-debug.tar.gz
52a3e2e864dd715480bebfc1ab6e72424270145d4e3994d656d13a7f1768f2ef  guix-build-b59a027d957a/output/arm-linux-gnueabihf/bitcoin-b59a027d957a-arm-linux-gnueabihf.tar.gz
5104daf56a644a946157998f18c01d1c014d11e88c142f60490fe821b4e23d22  guix-build-b59a027d957a/output/arm64-apple-darwin/SHA256SUMS.part
23bd453e64b4883ffaf479ddd5f87a6beb69aa54ede8e766736675913ff12aac  guix-build-b59a027d957a/output/arm64-apple-darwin/bitcoin-b59a027d957a-arm64-apple-darwin-unsigned.tar.gz
a5bb4d0d5b11036a7cfacd67b61a2617c282e320881e176f6c4d8e323ba90b9c  guix-build-b59a027d957a/output/arm64-apple-darwin/bitcoin-b59a027d957a-arm64-apple-darwin-unsigned.zip
3e0b68e6da97b0f735d5dec45ab6e05fb498cd7dbc2de02739d04ae0713f54c7  guix-build-b59a027d957a/output/arm64-apple-darwin/bitcoin-b59a027d957a-arm64-apple-darwin.tar.gz
0bacff86ef3e47e32ac141f1b496c0f55c1e846da4768c2a9fa5648ed397eb61  guix-build-b59a027d957a/output/dist-archive/bitcoin-b59a027d957a.tar.gz
0d0db2d1b7ad72596a3916ed141d2a43d53487bcd34b958a4bbdeef5d4f5fea1  guix-build-b59a027d957a/output/powerpc64-linux-gnu/SHA256SUMS.part
b40f62ca796c607a48aed528de19a4406b49130ddffee95061e17ba2d620384c  guix-build-b59a027d957a/output/powerpc64-linux-gnu/bitcoin-b59a027d957a-powerpc64-linux-gnu-debug.tar.gz
187b3f1dd9585d91aa8a5185aa86dde8a743f34787e710b9a5c755c03b755a67  guix-build-b59a027d957a/output/powerpc64-linux-gnu/bitcoin-b59a027d957a-powerpc64-linux-gnu.tar.gz
d37b86e2b6f4c66bc76d9e73b9bbd9a33f5a83bbf048719e4564dd9b147c2b85  guix-build-b59a027d957a/output/riscv64-linux-gnu/SHA256SUMS.part
989d1a9c3958ffe467de5c6f682944dc939db5c9e8e42ed40dc6ec6710fafe5c  guix-build-b59a027d957a/output/riscv64-linux-gnu/bitcoin-b59a027d957a-riscv64-linux-gnu-debug.tar.gz
b23e4b83c0171630dc6c27a3846b5a62f940a9c6f3b24e6e8e2a1537a8fa045c  guix-build-b59a027d957a/output/riscv64-linux-gnu/bitcoin-b59a027d957a-riscv64-linux-gnu.tar.gz
fbc95186aef10cf65727eb4296b7d21063d04e3ffda82dc918b6c8cddd01a20b  guix-build-b59a027d957a/output/x86_64-apple-darwin/SHA256SUMS.part
06911415068f781e00a52705f3c920a353065448941c43ffcb30495146d1f58a  guix-build-b59a027d957a/output/x86_64-apple-darwin/bitcoin-b59a027d957a-x86_64-apple-darwin-unsigned.tar.gz
e0fa356fac020116febef400e0b81850196575801dd749580e8ebce3fecdbacf  guix-build-b59a027d957a/output/x86_64-apple-darwin/bitcoin-b59a027d957a-x86_64-apple-darwin-unsigned.zip
b0aae18c633631220a256351c420b1202de68f21f643a51aed208e7f5b06beed  guix-build-b59a027d957a/output/x86_64-apple-darwin/bitcoin-b59a027d957a-x86_64-apple-darwin.tar.gz
52d765a9f8254fb5eed3acaf1d2e79e3861959a6cd573f516d5d1e3552302064  guix-build-b59a027d957a/output/x86_64-linux-gnu/SHA256SUMS.part
c6343c951a6818dd790b0cf2eae5f4432d99cc0b95617acb76510a866a0c2ac2  guix-build-b59a027d957a/output/x86_64-linux-gnu/bitcoin-b59a027d957a-x86_64-linux-gnu-debug.tar.gz
d02725d7ccd074031cda251e16bd4dac1743c07c5cb309920e6f080e3d88bc26  guix-build-b59a027d957a/output/x86_64-linux-gnu/bitcoin-b59a027d957a-x86_64-linux-gnu.tar.gz
5b4dc2d2514baea62ccd2b7104db919280d60ff0ffd7778dba9738fce308cd6c  guix-build-b59a027d957a/output/x86_64-w64-mingw32/SHA256SUMS.part
ed655ebd40ebdec1c4dd5a2ec88496adb8b5ae53a5b6ef4a86b39dcc2dc69c6b  guix-build-b59a027d957a/output/x86_64-w64-mingw32/bitcoin-b59a027d957a-win64-debug.zip
5b8e8ca1b8351b9656def4e76bc90a61d9a78a5b9f03d01a46bda7724d1e75b1  guix-build-b59a027d957a/output/x86_64-w64-mingw32/bitcoin-b59a027d957a-win64-setup-unsigned.exe
92e0678d69747a5d59e4856766088bfd89b712e8177f32bdaa6ea8b3711941af  guix-build-b59a027d957a/output/x86_64-w64-mingw32/bitcoin-b59a027d957a-win64-unsigned.tar.gz
adff1f20e85082280a1fa55595bbf83c4d4d31cfd72742b3c4b88617a033a22f  guix-build-b59a027d957a/output/x86_64-w64-mingw32/bitcoin-b59a027d957a-win64.zip

@Sjors
Copy link
Member

Sjors commented May 13, 2024

The second commit b59a027 seems trivially correct since get_machine is unused.

I got a bit confused about its history, so here it is:

  1. It first became unused in contrib: run test-symbol-check for RISC-V #21255 (merged Feb 22, 2021)
  2. It was then removed in test: Cleanup in test-{security,symbol}-check.py #21428 (merged Mar 18, 2021)
  3. It was reintroduced in guix: Test security-check sanity before performing them (with macOS) #22381 (merged Jul 9, 2021) in order to skip RISCV in TestSymbolChecks
  4. That skipping was no longer needed as of guix: consolidate to glibc 2.27 for Linux builds #27029 (merged Feb 17, 2023)

I'll do a guix build...

@TheCharlatan
Copy link
Contributor

Guix build (aarch64):

fcb75f2a3b61befeabe143301e5db490d23b1ee4a5edb109f219dea575395b49  guix-build-b59a027d957a/output/aarch64-linux-gnu/SHA256SUMS.part
15310e3aff2a9ef71bad06315fcd425e56611d5bed7f6c394f3fe2248140e17b  guix-build-b59a027d957a/output/aarch64-linux-gnu/bitcoin-b59a027d957a-aarch64-linux-gnu-debug.tar.gz
8e60146d39a47e9c332e3b842e239f1ca7773ca2e6788876155377f4568ab1fa  guix-build-b59a027d957a/output/aarch64-linux-gnu/bitcoin-b59a027d957a-aarch64-linux-gnu.tar.gz
10432256ead82aa9f6c6434eab427b2da70d7c17353274abd09dbde74380bfcc  guix-build-b59a027d957a/output/arm-linux-gnueabihf/SHA256SUMS.part
96c131400a038434f5338926d72c62d7fa260daf3dde9966c7d7880a182b0b6e  guix-build-b59a027d957a/output/arm-linux-gnueabihf/bitcoin-b59a027d957a-arm-linux-gnueabihf-debug.tar.gz
52a3e2e864dd715480bebfc1ab6e72424270145d4e3994d656d13a7f1768f2ef  guix-build-b59a027d957a/output/arm-linux-gnueabihf/bitcoin-b59a027d957a-arm-linux-gnueabihf.tar.gz
5104daf56a644a946157998f18c01d1c014d11e88c142f60490fe821b4e23d22  guix-build-b59a027d957a/output/arm64-apple-darwin/SHA256SUMS.part
23bd453e64b4883ffaf479ddd5f87a6beb69aa54ede8e766736675913ff12aac  guix-build-b59a027d957a/output/arm64-apple-darwin/bitcoin-b59a027d957a-arm64-apple-darwin-unsigned.tar.gz
a5bb4d0d5b11036a7cfacd67b61a2617c282e320881e176f6c4d8e323ba90b9c  guix-build-b59a027d957a/output/arm64-apple-darwin/bitcoin-b59a027d957a-arm64-apple-darwin-unsigned.zip
3e0b68e6da97b0f735d5dec45ab6e05fb498cd7dbc2de02739d04ae0713f54c7  guix-build-b59a027d957a/output/arm64-apple-darwin/bitcoin-b59a027d957a-arm64-apple-darwin.tar.gz
0bacff86ef3e47e32ac141f1b496c0f55c1e846da4768c2a9fa5648ed397eb61  guix-build-b59a027d957a/output/dist-archive/bitcoin-b59a027d957a.tar.gz
0d0db2d1b7ad72596a3916ed141d2a43d53487bcd34b958a4bbdeef5d4f5fea1  guix-build-b59a027d957a/output/powerpc64-linux-gnu/SHA256SUMS.part
b40f62ca796c607a48aed528de19a4406b49130ddffee95061e17ba2d620384c  guix-build-b59a027d957a/output/powerpc64-linux-gnu/bitcoin-b59a027d957a-powerpc64-linux-gnu-debug.tar.gz
187b3f1dd9585d91aa8a5185aa86dde8a743f34787e710b9a5c755c03b755a67  guix-build-b59a027d957a/output/powerpc64-linux-gnu/bitcoin-b59a027d957a-powerpc64-linux-gnu.tar.gz
d37b86e2b6f4c66bc76d9e73b9bbd9a33f5a83bbf048719e4564dd9b147c2b85  guix-build-b59a027d957a/output/riscv64-linux-gnu/SHA256SUMS.part
989d1a9c3958ffe467de5c6f682944dc939db5c9e8e42ed40dc6ec6710fafe5c  guix-build-b59a027d957a/output/riscv64-linux-gnu/bitcoin-b59a027d957a-riscv64-linux-gnu-debug.tar.gz
b23e4b83c0171630dc6c27a3846b5a62f940a9c6f3b24e6e8e2a1537a8fa045c  guix-build-b59a027d957a/output/riscv64-linux-gnu/bitcoin-b59a027d957a-riscv64-linux-gnu.tar.gz
fbc95186aef10cf65727eb4296b7d21063d04e3ffda82dc918b6c8cddd01a20b  guix-build-b59a027d957a/output/x86_64-apple-darwin/SHA256SUMS.part
06911415068f781e00a52705f3c920a353065448941c43ffcb30495146d1f58a  guix-build-b59a027d957a/output/x86_64-apple-darwin/bitcoin-b59a027d957a-x86_64-apple-darwin-unsigned.tar.gz
e0fa356fac020116febef400e0b81850196575801dd749580e8ebce3fecdbacf  guix-build-b59a027d957a/output/x86_64-apple-darwin/bitcoin-b59a027d957a-x86_64-apple-darwin-unsigned.zip
b0aae18c633631220a256351c420b1202de68f21f643a51aed208e7f5b06beed  guix-build-b59a027d957a/output/x86_64-apple-darwin/bitcoin-b59a027d957a-x86_64-apple-darwin.tar.gz
52d765a9f8254fb5eed3acaf1d2e79e3861959a6cd573f516d5d1e3552302064  guix-build-b59a027d957a/output/x86_64-linux-gnu/SHA256SUMS.part
c6343c951a6818dd790b0cf2eae5f4432d99cc0b95617acb76510a866a0c2ac2  guix-build-b59a027d957a/output/x86_64-linux-gnu/bitcoin-b59a027d957a-x86_64-linux-gnu-debug.tar.gz
d02725d7ccd074031cda251e16bd4dac1743c07c5cb309920e6f080e3d88bc26  guix-build-b59a027d957a/output/x86_64-linux-gnu/bitcoin-b59a027d957a-x86_64-linux-gnu.tar.gz
5b4dc2d2514baea62ccd2b7104db919280d60ff0ffd7778dba9738fce308cd6c  guix-build-b59a027d957a/output/x86_64-w64-mingw32/SHA256SUMS.part
ed655ebd40ebdec1c4dd5a2ec88496adb8b5ae53a5b6ef4a86b39dcc2dc69c6b  guix-build-b59a027d957a/output/x86_64-w64-mingw32/bitcoin-b59a027d957a-win64-debug.zip
5b8e8ca1b8351b9656def4e76bc90a61d9a78a5b9f03d01a46bda7724d1e75b1  guix-build-b59a027d957a/output/x86_64-w64-mingw32/bitcoin-b59a027d957a-win64-setup-unsigned.exe
92e0678d69747a5d59e4856766088bfd89b712e8177f32bdaa6ea8b3711941af  guix-build-b59a027d957a/output/x86_64-w64-mingw32/bitcoin-b59a027d957a-win64-unsigned.tar.gz
adff1f20e85082280a1fa55595bbf83c4d4d31cfd72742b3c4b88617a033a22f  guix-build-b59a027d957a/output/x86_64-w64-mingw32/bitcoin-b59a027d957a-win64.zip

Copy link
Contributor

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK b59a027

@fanquake fanquake merged commit 695d801 into bitcoin:master May 15, 2024
16 checks passed
@fanquake fanquake deleted the get_arch_env_flags branch May 15, 2024 01:05
Copy link
Member

@willcl-ark willcl-ark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

post-merge ACK b59a027

My hashes match, but don't include the output/*/SHA256SUMS.part output lines:

15310e3aff2a9ef71bad06315fcd425e56611d5bed7f6c394f3fe2248140e17b  bitcoin-b59a027d957a-aarch64-linux-gnu-debug.tar.gz
8e60146d39a47e9c332e3b842e239f1ca7773ca2e6788876155377f4568ab1fa  bitcoin-b59a027d957a-aarch64-linux-gnu.tar.gz
96c131400a038434f5338926d72c62d7fa260daf3dde9966c7d7880a182b0b6e  bitcoin-b59a027d957a-arm-linux-gnueabihf-debug.tar.gz
52a3e2e864dd715480bebfc1ab6e72424270145d4e3994d656d13a7f1768f2ef  bitcoin-b59a027d957a-arm-linux-gnueabihf.tar.gz
23bd453e64b4883ffaf479ddd5f87a6beb69aa54ede8e766736675913ff12aac  bitcoin-b59a027d957a-arm64-apple-darwin-unsigned.tar.gz
a5bb4d0d5b11036a7cfacd67b61a2617c282e320881e176f6c4d8e323ba90b9c  bitcoin-b59a027d957a-arm64-apple-darwin-unsigned.zip
3e0b68e6da97b0f735d5dec45ab6e05fb498cd7dbc2de02739d04ae0713f54c7  bitcoin-b59a027d957a-arm64-apple-darwin.tar.gz
0bacff86ef3e47e32ac141f1b496c0f55c1e846da4768c2a9fa5648ed397eb61  bitcoin-b59a027d957a.tar.gz
b40f62ca796c607a48aed528de19a4406b49130ddffee95061e17ba2d620384c  bitcoin-b59a027d957a-powerpc64-linux-gnu-debug.tar.gz
187b3f1dd9585d91aa8a5185aa86dde8a743f34787e710b9a5c755c03b755a67  bitcoin-b59a027d957a-powerpc64-linux-gnu.tar.gz
989d1a9c3958ffe467de5c6f682944dc939db5c9e8e42ed40dc6ec6710fafe5c  bitcoin-b59a027d957a-riscv64-linux-gnu-debug.tar.gz
b23e4b83c0171630dc6c27a3846b5a62f940a9c6f3b24e6e8e2a1537a8fa045c  bitcoin-b59a027d957a-riscv64-linux-gnu.tar.gz
06911415068f781e00a52705f3c920a353065448941c43ffcb30495146d1f58a  bitcoin-b59a027d957a-x86_64-apple-darwin-unsigned.tar.gz
e0fa356fac020116febef400e0b81850196575801dd749580e8ebce3fecdbacf  bitcoin-b59a027d957a-x86_64-apple-darwin-unsigned.zip
b0aae18c633631220a256351c420b1202de68f21f643a51aed208e7f5b06beed  bitcoin-b59a027d957a-x86_64-apple-darwin.tar.gz
c6343c951a6818dd790b0cf2eae5f4432d99cc0b95617acb76510a866a0c2ac2  bitcoin-b59a027d957a-x86_64-linux-gnu-debug.tar.gz
d02725d7ccd074031cda251e16bd4dac1743c07c5cb309920e6f080e3d88bc26  bitcoin-b59a027d957a-x86_64-linux-gnu.tar.gz
ed655ebd40ebdec1c4dd5a2ec88496adb8b5ae53a5b6ef4a86b39dcc2dc69c6b  bitcoin-b59a027d957a-win64-debug.zip
5b8e8ca1b8351b9656def4e76bc90a61d9a78a5b9f03d01a46bda7724d1e75b1  bitcoin-b59a027d957a-win64-setup-unsigned.exe
92e0678d69747a5d59e4856766088bfd89b712e8177f32bdaa6ea8b3711941af  bitcoin-b59a027d957a-win64-unsigned.tar.gz
adff1f20e85082280a1fa55595bbf83c4d4d31cfd72742b3c4b88617a033a22f  bitcoin-b59a027d957a-win64.zip

fanquake added a commit that referenced this pull request May 22, 2024
fa3e115 doc: Correct pull request prefix for scripts and tools (MarcoFalke)

Pull request description:

  `script` is confusing, because in the context of Bitcoin, it usually means Bitcoin script (c.f. `CScript` in `script.h`, or pull requests such as #27122 using the prefix).

  This could be fixed by renaming it to `scripts` (with a plural `s` at the end), however, looking at the current usage `contrib` and `cli` seem more common (#29687, #26953, #26584, #24864, #30074, #29433 ...)

ACKs for top commit:
  fanquake:
    ACK fa3e115
  willcl-ark:
    ACK fa3e115
  hebasto:
    ACK fa3e115.
  theuni:
    ACK fa3e115

Tree-SHA512: fb3a3892ca5f859e590c8a620350c397ef1f9eafd9e174c70ef50095d401a396758d6c93ad41888da8025c41e25e691f30c18f9e974af13597f2266bb2c53b6d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants