guix: remove `gcc-toolchain static` from Windows build

fanquake commented at 1:37 pm on April 7, 2024: member

The libs in this dir are the following:

0ls /gnu/store/2vnbkrdin4rrf7ygnr80mlcglin4qqa4-gcc-toolchain-12.3.0-static/lib/
1libanl.a           libc.a             libdl.a         libm.a
2libBrokenLocale.a  libcrypt.a         libg.a          libmcheck.a
3libpthread.a       librt.a
4libresolv.a        libutil.a

These do not need to be propogated into the Windows build environment.

Guix Build (aarch64):

0450c0c4f45f9cb7ed7fc2ef6e7557b6a23004b82c951399da3b7635e8451a076  guix-build-05da2460db89/output/dist-archive/bitcoin-05da2460db89.tar.gz
15df68ab18636090c387bc90297356d0e148b02931d3a99c0f6d33cd268aa072b  guix-build-05da2460db89/output/x86_64-w64-mingw32/SHA256SUMS.part
213e979f60d9296aa11081fbbb360404da9fbb797bb4663ed2d1189d800659b4f  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-debug.zip
3d1cc78437a96f012a59af7c757bef592f163559e523d45014d7804d0be29a8b8  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-setup-unsigned.exe
433a9cfd4475677646bb32c9c45c25bd796ca5adb126590bf556d4e6f9592c676  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-unsigned.tar.gz
55d2ee251668d3d31bf378826ab06f98542dd20926cdee2df5c3315e11222a519  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64.zip

Somewhat similar to #29673.

guix: remove gcc-toolchain static from Windows build

The libs in this dir are the following:
```bash
ls /gnu/store/2vnbkrdin4rrf7ygnr80mlcglin4qqa4-gcc-toolchain-12.3.0-static/lib/lib
libanl.a           libc.a             libdl.a         libm.a
libBrokenLocale.a  libcrypt.a         libg.a          libmcheck.a
libpthread.a       librt.a
libresolv.a        libutil.a
```

These do not need to be propogated into the Windows build environment.

05da2460db

DrahtBot commented at 1:37 pm on April 7, 2024: contributor

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	hebasto, laanwj
Concept ACK	TheCharlatan

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

#29881 (guix: use GCC 13 to builds releases by fanquake)
#25573 ([POC] guix: produce a fully -static-pie bitcoind by fanquake)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

DrahtBot added the label Build system on Apr 7, 2024

fanquake added the label DrahtBot Guix build requested on Apr 7, 2024

TheCharlatan commented at 1:46 pm on April 7, 2024: contributor

Nice, Concept ACK

DrahtBot commented at 1:40 am on April 8, 2024: contributor

Guix builds (on x86_64)

File	commit f0794cbd405636a7f528a60f2873050b865cf7e8(master)	commit 62f8123ea48cd2be1793e71fc5f7008e4de0d25c(master and this pull)
SHA256SUMS.part	`f8e45482d1003168...`	`29fa12e0467c8470...`
*-aarch64-linux-gnu-debug.tar.gz	`97acce1465f8e6f6...`	`4873107c4c0074b3...`
*-aarch64-linux-gnu.tar.gz	`a427dc1cd1a7addb...`	`c1cc36508b9890c0...`
*-arm-linux-gnueabihf-debug.tar.gz	`4c34f574c8eddf6f...`	`d999a90cee680a49...`
*-arm-linux-gnueabihf.tar.gz	`ca8b0244fc1b5a39...`	`b41dad7986d348e1...`
*-arm64-apple-darwin-unsigned.tar.gz	`e3b54271a4830765...`	`b6058d7967776857...`
*-arm64-apple-darwin-unsigned.zip	`37183bb7db240471...`	`22fff1cf969b7c05...`
*-arm64-apple-darwin.tar.gz	`075000d3a891e195...`	`d02b9a75ebc7b28b...`
*-powerpc64-linux-gnu-debug.tar.gz	`d3453986b815b5f2...`	`434a0e247a6e416f...`
*-powerpc64-linux-gnu.tar.gz	`b2585cb4905b855d...`	`ae4bf1aa37a2e9de...`
*-riscv64-linux-gnu-debug.tar.gz	`5be7098db81b0488...`	`3b316bc68722ddaa...`
*-riscv64-linux-gnu.tar.gz	`8633b44ae369acd4...`	`f44e8e4ed652fea7...`
*-x86_64-apple-darwin-unsigned.tar.gz	`ebbcc939b2c2019f...`	`582183934d5fb411...`
*-x86_64-apple-darwin-unsigned.zip	`65368f59a537943f...`	`63a7e5e4b0c22a26...`
*-x86_64-apple-darwin.tar.gz	`fd2432f87574bc3a...`	`645c2f6cb0ab9f99...`
*-x86_64-linux-gnu-debug.tar.gz	`aa589a4d9debd1df...`	`ef3844733b69cbd6...`
*-x86_64-linux-gnu.tar.gz	`0ad246161d760239...`	`6fe6712aa63230ad...`
*.tar.gz	`e819c339f21263a6...`	`deeff4b17b284992...`
guix_build.log	`e010f119ae8dc95d...`	`c86001e89b687ffe...`
guix_build.log.diff		`c6e87bb48dd8b49d...`

DrahtBot removed the label DrahtBot Guix build requested on Apr 8, 2024

laanwj commented at 3:48 pm on April 11, 2024: member

As this still passes the symbol import check (no extra DLL dependencies introduced) i suppose this is correct. Good find!

hebasto approved

hebasto commented at 9:03 am on April 16, 2024: member

ACK 05da2460db895374ea1fd89e4b8b4b73689f8faf,

My Guix build:

0450c0c4f45f9cb7ed7fc2ef6e7557b6a23004b82c951399da3b7635e8451a076  guix-build-05da2460db89/output/dist-archive/bitcoin-05da2460db89.tar.gz
15df68ab18636090c387bc90297356d0e148b02931d3a99c0f6d33cd268aa072b  guix-build-05da2460db89/output/x86_64-w64-mingw32/SHA256SUMS.part
213e979f60d9296aa11081fbbb360404da9fbb797bb4663ed2d1189d800659b4f  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-debug.zip
3d1cc78437a96f012a59af7c757bef592f163559e523d45014d7804d0be29a8b8  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-setup-unsigned.exe
433a9cfd4475677646bb32c9c45c25bd796ca5adb126590bf556d4e6f9592c676  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-unsigned.tar.gz
55d2ee251668d3d31bf378826ab06f98542dd20926cdee2df5c3315e11222a519  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64.zip

DrahtBot requested review from TheCharlatan on Apr 16, 2024

laanwj commented at 12:20 pm on April 16, 2024: member

ACK 05da2460db895374ea1fd89e4b8b4b73689f8faf

i get the same build output as @hebasto
compared the import headers between this PR and the commit before it, no changes at all:

 0$ x86_64-w64-mingw32-objdump -p bitcoin-05da2460db89/bin/bitcoin-qt.exe > b
 1$ x86_64-w64-mingw32-objdump -p bitcoin-f0794cbd4056/bin/bitcoin-qt.exe > a
 2$ diff -du a b
 3--- a   2024-04-16 14:15:13.713101675 +0200
 4+++ b   2024-04-16 14:15:06.641040571 +0200
 5@@ -1,5 +1,5 @@
 6
 7-bitcoin-f0794cbd4056/bin/bitcoin-qt.exe:     file format pei-x86-64
 8+bitcoin-05da2460db89/bin/bitcoin-qt.exe:     file format pei-x86-64
 9
10 Characteristics 0x2e
11        executable
12@@ -28,7 +28,7 @@
13 Win32Version           00000000
14 SizeOfImage            025aa000
15 SizeOfHeaders          00000400
16-CheckSum               02597a7c
17+CheckSum               0258ccc8
18 Subsystem              00000002        (Windows GUI)
19 DllCharacteristics     00000160
20                                        HIGH_ENTROPY_VA

(there’s a slight difference in the binary, but this looks only related to embedded version strings)

fanquake merged this on Apr 17, 2024

fanquake closed this on Apr 17, 2024

fanquake deleted the branch on Apr 17, 2024

guix: remove gcc-toolchain static from Windows build #29828

Code Coverage

Reviews

Conflicts

Guix builds (on x86_64)

guix: remove `gcc-toolchain static` from Windows build #29828