Skip to content

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Apr 7, 2024

The libs in this dir are the following:

ls /gnu/store/2vnbkrdin4rrf7ygnr80mlcglin4qqa4-gcc-toolchain-12.3.0-static/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.

Guix Build (aarch64):

450c0c4f45f9cb7ed7fc2ef6e7557b6a23004b82c951399da3b7635e8451a076  guix-build-05da2460db89/output/dist-archive/bitcoin-05da2460db89.tar.gz
5df68ab18636090c387bc90297356d0e148b02931d3a99c0f6d33cd268aa072b  guix-build-05da2460db89/output/x86_64-w64-mingw32/SHA256SUMS.part
13e979f60d9296aa11081fbbb360404da9fbb797bb4663ed2d1189d800659b4f  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-debug.zip
d1cc78437a96f012a59af7c757bef592f163559e523d45014d7804d0be29a8b8  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-setup-unsigned.exe
33a9cfd4475677646bb32c9c45c25bd796ca5adb126590bf556d4e6f9592c676  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-unsigned.tar.gz
5d2ee251668d3d31bf378826ab06f98542dd20926cdee2df5c3315e11222a519  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64.zip

Somewhat similar to #29673.

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.
@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 7, 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 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.

@TheCharlatan
Copy link
Contributor

Nice, Concept ACK

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 8, 2024

Guix builds (on x86_64)

File commit f0794cb
(master)
commit 62f8123
(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...

@laanwj
Copy link
Member

laanwj commented Apr 11, 2024

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

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK 05da246,

My Guix build:

450c0c4f45f9cb7ed7fc2ef6e7557b6a23004b82c951399da3b7635e8451a076  guix-build-05da2460db89/output/dist-archive/bitcoin-05da2460db89.tar.gz
5df68ab18636090c387bc90297356d0e148b02931d3a99c0f6d33cd268aa072b  guix-build-05da2460db89/output/x86_64-w64-mingw32/SHA256SUMS.part
13e979f60d9296aa11081fbbb360404da9fbb797bb4663ed2d1189d800659b4f  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-debug.zip
d1cc78437a96f012a59af7c757bef592f163559e523d45014d7804d0be29a8b8  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-setup-unsigned.exe
33a9cfd4475677646bb32c9c45c25bd796ca5adb126590bf556d4e6f9592c676  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-unsigned.tar.gz
5d2ee251668d3d31bf378826ab06f98542dd20926cdee2df5c3315e11222a519  guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64.zip

@DrahtBot DrahtBot requested a review from TheCharlatan April 16, 2024 09:03
@laanwj
Copy link
Member

laanwj commented Apr 16, 2024

ACK 05da246

  • i get the same build output as @hebasto
  • compared the import headers between this PR and the commit before it, no changes at all:
$ x86_64-w64-mingw32-objdump -p bitcoin-05da2460db89/bin/bitcoin-qt.exe > b
$ x86_64-w64-mingw32-objdump -p bitcoin-f0794cbd4056/bin/bitcoin-qt.exe > a
$ diff -du a b
--- a   2024-04-16 14:15:13.713101675 +0200
+++ b   2024-04-16 14:15:06.641040571 +0200
@@ -1,5 +1,5 @@

-bitcoin-f0794cbd4056/bin/bitcoin-qt.exe:     file format pei-x86-64
+bitcoin-05da2460db89/bin/bitcoin-qt.exe:     file format pei-x86-64

 Characteristics 0x2e
        executable
@@ -28,7 +28,7 @@
 Win32Version           00000000
 SizeOfImage            025aa000
 SizeOfHeaders          00000400
-CheckSum               02597a7c
+CheckSum               0258ccc8
 Subsystem              00000002        (Windows GUI)
 DllCharacteristics     00000160
                                        HIGH_ENTROPY_VA

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

@fanquake fanquake merged commit 5c10d12 into bitcoin:master Apr 17, 2024
@fanquake fanquake deleted the win_guix_drop_static_toolchain branch April 17, 2024 07:56
kwvg added a commit to kwvg/dash that referenced this pull request Nov 4, 2024
kwvg added a commit to kwvg/dash that referenced this pull request Nov 5, 2024
kwvg added a commit to kwvg/dash that referenced this pull request Nov 10, 2024
PastaPastaPasta added a commit to dashpay/dash that referenced this pull request Nov 12, 2024
, bitcoin#28786, bitcoin#29078, bitcoin#27897, bitcoin#29651, bitcoin#29695, bitcoin#29673, bitcoin#29828, bitcoin#29846, bitcoin#30231, bitcoin#30438, partial bitcoin#30511 (guix backports: part 5)

91b7ef8 merge bitcoin#30438: build Linux GCC with --enable-cet (Kittywhiskers Van Gogh)
cfc6cba partial bitcoin#30511: GCC 12 consolidation (Kittywhiskers Van Gogh)
06f5431 merge bitcoin#30231: bump time-machine to f0bb724211872cd6158fce6162e0b8c73efed126 (Kittywhiskers Van Gogh)
5b292ee merge bitcoin#29846: replace GCC unaligned VMOV patch with binutils patch (Kittywhiskers Van Gogh)
4d1f7dc merge bitcoin#29828: remove `gcc-toolchain static` from Windows build (Kittywhiskers Van Gogh)
f321d3d merge bitcoin#29673: use GCC 11 in macOS build env (Kittywhiskers Van Gogh)
d570e2d merge bitcoin#29695: build GCC with --enable-standard-branch-protection (Kittywhiskers Van Gogh)
c965943 merge bitcoin#29651: bump time-machine to dc4842797bfdc5f9f3f5f725bf189c2b68bd6b5a (Kittywhiskers Van Gogh)
59a125a merge bitcoin#27897: use GCC 12.3.0 to build releases (Kittywhiskers Van Gogh)
a701b06 merge bitcoin#29078: Bump guix time-machine to unlock riscv64 metal (Kittywhiskers Van Gogh)
d4b10a3 merge bitcoin#28786: switch to 6.1 kernel headers over 5.15 (Kittywhiskers Van Gogh)
c371870 merge bitcoin#28580: update time-machine (Kittywhiskers Van Gogh)
d36c9b6 merge bitcoin#28759: update signapple to latest master (Kittywhiskers Van Gogh)
38c71d8 merge bitcoin#28370: remove GCC 10 workaround from NSIS (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * Dependent on #6382
  * Dependency for #6384

  ## Breaking Changes

  None expected

  ## Checklist

  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)**
  - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)**
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK 91b7ef8

Tree-SHA512: 0cfb436a430cf4b624a48a9928ecac9cd5c50e88e51ed04e7d1d0100968af8be1183364f035ac75153781a5e1616aa2f6fadabf0a1c03ec4b66dedea544b77ad
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Nov 29, 2024
Summary:
```
These do not need to be propogated into the Windows build environment.
```

Backport of core  [[bitcoin/bitcoin#29828 | core#29828]]

Depends on D17234.

Test Plan: Run the windows GUIX build

Reviewers: #bitcoin_abc, PiRK

Reviewed By: #bitcoin_abc, PiRK

Differential Revision: https://reviews.bitcoinabc.org/D17235
roqqit pushed a commit to doged-io/doged that referenced this pull request Dec 2, 2024
Summary:
```
These do not need to be propogated into the Windows build environment.
```

Backport of core  [[bitcoin/bitcoin#29828 | core#29828]]

Depends on D17234.

Test Plan: Run the windows GUIX build

Reviewers: #bitcoin_abc, PiRK

Reviewed By: #bitcoin_abc, PiRK

Differential Revision: https://reviews.bitcoinabc.org/D17235
knst added a commit to knst/dash that referenced this pull request Dec 26, 2024
@bitcoin bitcoin locked and limited conversation to collaborators Apr 17, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants