Skip to content

Revert "guix: Build depends/qt with our platform definition" #26059

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Sep 13, 2022
Merged

Revert "guix: Build depends/qt with our platform definition" #26059

merged 1 commit into from
Sep 13, 2022

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Sep 10, 2022

This PR reverts commit dc4137a.

It is no longer required after #25838.

Guix build on x86_64:

2896943c8379f5bfe187666862e0cfcb619bd6c4c98ec6a25cadba1a3e15dad7  guix-build-beb94261ea9d/output/dist-archive/bitcoin-beb94261ea9d.tar.gz
9c829d2c488b07b181fd90590e0ac763761edfa1d231daccd5d25038707f321c  guix-build-beb94261ea9d/output/x86_64-linux-gnu/SHA256SUMS.part
2393a54db15ae372e974f562438c3cd6be3dbde07c3090c1ae884cc6941e7d26  guix-build-beb94261ea9d/output/x86_64-linux-gnu/bitcoin-beb94261ea9d-x86_64-linux-gnu-debug.tar.gz
397f9c023d41a6bf2a8844121badbbd0066e45304e1e085e217e9a0b5d42f088  guix-build-beb94261ea9d/output/x86_64-linux-gnu/bitcoin-beb94261ea9d-x86_64-linux-gnu.tar.gz

@DrahtBot
Copy link
Contributor

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #25573 ([POC] guix: produce a fully -static-pie x86_64 bitcoind using GCC and glibc by fanquake)
  • #25391 (guix: Use LTO to build releases 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.

@jarolrod
Copy link
Member

jarolrod commented Sep 11, 2022 •
edited
Loading

concept ack

guix hashes:

x86:

$ env HOSTS='x86_64-linux-gnu' ./contrib/guix/guix-build 
$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum

2896943c8379f5bfe187666862e0cfcb619bd6c4c98ec6a25cadba1a3e15dad7  guix-build-beb94261ea9d/output/dist-archive/bitcoin-beb94261ea9d.tar.gz  
9c829d2c488b07b181fd90590e0ac763761edfa1d231daccd5d25038707f321c  guix-build-beb94261ea9d/output/x86_64-linux-gnu/SHA256SUMS.part                                            
2393a54db15ae372e974f562438c3cd6be3dbde07c3090c1ae884cc6941e7d26  guix-build-beb94261ea9d/output/x86_64-linux-gnu/bitcoin-beb94261ea9d-x86_64-linux-gnu-debug.tar.gz         
397f9c023d41a6bf2a8844121badbbd0066e45304e1e085e217e9a0b5d42f088  guix-build-beb94261ea9d/output/x86_64-linux-gnu/bitcoin-beb94261ea9d-x86_64-linux-gnu.tar.gz

arm64:

$ env HOSTS='x86_64-linux-gnu' ./contrib/guix/guix-build 
$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum

2896943c8379f5bfe187666862e0cfcb619bd6c4c98ec6a25cadba1a3e15dad7  guix-build-beb94261ea9d/output/dist-archive/bitcoin-beb94261ea9d.tar.gz
9c829d2c488b07b181fd90590e0ac763761edfa1d231daccd5d25038707f321c  guix-build-beb94261ea9d/output/x86_64-linux-gnu/SHA256SUMS.part
2393a54db15ae372e974f562438c3cd6be3dbde07c3090c1ae884cc6941e7d26  guix-build-beb94261ea9d/output/x86_64-linux-gnu/bitcoin-beb94261ea9d-x86_64-linux-gnu-debug.tar.gz
397f9c023d41a6bf2a8844121badbbd0066e45304e1e085e217e9a0b5d42f088  guix-build-beb94261ea9d/output/x86_64-linux-gnu/bitcoin-beb94261ea9d-x86_64-linux-gnu.tar.gz

@fanquake
Copy link
Member

ACK beb9426

Guix Build (x86_64 & aarch64):

2896943c8379f5bfe187666862e0cfcb619bd6c4c98ec6a25cadba1a3e15dad7  guix-build-beb94261ea9d/output/dist-archive/bitcoin-beb94261ea9d.tar.gz
9c829d2c488b07b181fd90590e0ac763761edfa1d231daccd5d25038707f321c  guix-build-beb94261ea9d/output/x86_64-linux-gnu/SHA256SUMS.part
2393a54db15ae372e974f562438c3cd6be3dbde07c3090c1ae884cc6941e7d26  guix-build-beb94261ea9d/output/x86_64-linux-gnu/bitcoin-beb94261ea9d-x86_64-linux-gnu-debug.tar.gz
397f9c023d41a6bf2a8844121badbbd0066e45304e1e085e217e9a0b5d42f088  guix-build-beb94261ea9d/output/x86_64-linux-gnu/bitcoin-beb94261ea9d-x86_64-linux-gnu.tar.gz

jarolrod
jarolrod approved these changes Sep 13, 2022
View reviewed changes
Copy link
Member

@jarolrod jarolrod left a comment

Choose a reason for hiding this comment

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

ACK beb9426

not needed here because it's now in our qt.mk

@fanquake fanquake merged commit 995fdef into bitcoin:master Sep 13, 2022
@hebasto hebasto deleted the 220910-guix branch September 13, 2022 11:03
@DrahtBot DrahtBot mentioned this pull request Sep 13, 2022
Draft
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Sep 13, 2022
@fanquake
Merge bitcoin#26059: Revert "guix: Build depends/qt with our platform…
614aa77 
… defini
@DrahtBot DrahtBot mentioned this pull request Sep 13, 2022
Closed
@bitcoin bitcoin locked and limited conversation to collaborators Sep 15, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
1 more reviewer

@jarolrod jarolrod jarolrod approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
Build system
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@hebasto @DrahtBot @jarolrod @fanquake @maflcko