guix: Build support for macOS #17920

dongcarl · 2020-01-13T20:59:51Z

This PR brings our Guix builds on par with Gitian in terms of supported architectures.

Reviewers: if you run a build, please submit:

find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum

So that we can compare hashes and ensure reproducibility!

DrahtBot · 2020-01-13T23:47:42Z

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

depends: Improve id string robustness #20629 (depends: Improve id string robustness by dongcarl)

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.

fanquake

Obviously concept ACK on macOS GUIX builds. Not going to comment on the interim system Clang commits here.

fanquake · 2020-01-14T04:02:54Z

contrib/guix/libexec/build-osx.sh

+#     esac
+# )
+
+# Environment variables for determinism


I assume we no longer have to set ZERO_AR_DATE here because we're not using a libtool from cctools?

From libtool.c:

all of these values are initialized to reasonable defaults for deterministic
archives: archives that are consistent regardless of user, time, or umask
differences. Ordinarily, these values and will be set to more specific
ones when building new archives, but that can be suppressed using the
'-D' option or the ZERO_AR_DATE environment variable.

contrib/guix/libexec/build.sh

dongcarl · 2020-07-30T18:28:37Z

Update: this is still being actively worked on. Current hurdle: some weird clang internal search path logic.

Sjors · 2020-12-11T18:34:05Z

Tested 40ad768. I (re)installed guix on an Ubuntu 20 machine and used --no-substitutes and --bootstrap to exercise my low time preference.

This did not go without hickups, e.g.:

guix install glibc-locales (as root, this would fail without substitutes) and configuring GUIX_LOCPATH (as guix user) is not particularly well documented upstream
during guix-build.sh the step /gnu/store/36fgj9n3c8bmix2pd12kfaszi7bd5y7a-ghostscript-9.27.drv' failed without too much actionable info. I tried dropping --bootstrap, but got the same error, so I ended up dropping --no-substitutes as well
noticed a warning: Computing Guix derivation for 'x86_64-linux'... WARNING: (guix build emacs-build-system): imported module (guix build utils) overrides core binding delete'`

Not sure what file is most useful to compare, but here's a few:

0aa66de467110bf45e7606d2696ea4417d4a94fdc59495646428c1ca05e2e744  distsrc-x86_64-linux-gnu/src/bitcoind
2b75f3955337b0345c7b6e33ad83185bba06ea96f1aedc30b7894c20af4489ee  distsrc-x86_64-apple-darwin16/Bitcoin-Qt.app/Contents/MacOS/Bitcoin-Qt

I can also still build and use depends on native macOS Big Sur. CI seems to struggle, maybe a spurious failure.

You may want to link to the macOS SDK extraction instructions (and that it needs to be untarred into depends/SDK's).

You may want to rebase (#20470) now that #20422 landed, since it changed make deploy (I just tried a rebase and it seems to behave at least on macOS itself).

Does this PR mean you can switch to the upstream GUIX repo? Or are there still patches? See 93439a7

dongcarl · 2020-12-11T19:48:00Z

Many thanks for testing @Sjors! Your review is super helpful as I want to make this process as user-friendly as possible. Even for the folks building without substitutes! Cheers.

To start off, it seems like reproducibility is working!

$ sha256sum distsrc-x86_64-linux-gnu/src/bitcoind distsrc-x86_64-apple-darwin16/Bitcoin-Qt.app/Contents/MacOS/Bitcoin-Qt
0aa66de467110bf45e7606d2696ea4417d4a94fdc59495646428c1ca05e2e744  distsrc-x86_64-linux-gnu/src/bitcoind
2b75f3955337b0345c7b6e33ad83185bba06ea96f1aedc30b7894c20af4489ee  distsrc-x86_64-apple-darwin16/Bitcoin-Qt.app/Contents/MacOS/Bitcoin-Qt

Now onto your concerns:

guix install glibc-locales (as root, this would fail without substitutes) and configuring GUIX_LOCPATH (as guix user) is not particularly well documented upstream

Very true, I've had experience with this myself, I will write up some documentation. As for the glibc-locales failure, could you send me your guix describe?

during guix-build.sh the step /gnu/store/36fgj9n3c8bmix2pd12kfaszi7bd5y7a-ghostscript-9.27.drv' failed without too much actionable info. I tried dropping --bootstrap, but got the same error, so I ended up dropping --no-substitutes as well

I've encountered this a while ago, so this must be an outstanding bug. I will look into it! I also think it may be good for me to write down in the README how to report Guix build failures (Guix always saves a bzip'd full log file in /var/log/guix for failed builds).

noticed a warning: Computing Guix derivation for 'x86_64-linux'... WARNING: (guix build emacs-build-system): imported module (guix build utils) overrides core binding delete'`

That warning is an old bug that has since been fixed here: https://issues.guix.gnu.org/41595. I will see how we can mitigate against this as well, may just have to bump my time-machine commit!

You may want to link to the macOS SDK extraction instructions (and that it needs to be untarred into depends/SDK's).

Sure! I added a check for it in the script but I agree that it should be in the README as well!

You may want to rebase (#20470) now that #20422 landed, since it changed make deploy (I just tried a rebase and it seems to behave at least on macOS itself).

Ah I did rebase that one, but not the cherry-picked commits in here. Will do!

Does this PR mean you can switch to the upstream GUIX repo? Or are there still patches? See 93439a7

I want to switch over to upstream GUIX once everything is finalized. There could still be things that crop up I need to patch, but it's looking increasingly unlikely.

Sjors · 2020-12-13T14:04:44Z

guix describe (as root)

/gnu/store/pwcp239kjf7lnj5i4lkdzcfcxwcfyk72-bash-minimal-5.0.16/bin/bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
guix describe: error: failed to determine origin
hint: Perhaps this `guix' command was not obtained with `guix pull'? Its version string is 1.2.0.

(my Ubuntu install in general is a cluster f*** that I very much feel like reinstalling from scratch, FWIW)

may just have to bump my time-machine commit

Happy to try again after that.

dongcarl · 2020-12-14T23:51:40Z

@Sjors Looking into a few things... Could you send me the file that's returned by:

$ guix build --log-file /gnu/store/36fgj9n3c8bmix2pd12kfaszi7bd5y7a-ghostscript-9.27.drv

Much appreciated.

Sjors · 2020-12-15T12:48:19Z

As user guix as well as root:

/gnu/store/pwcp239kjf7lnj5i4lkdzcfcxwcfyk72-bash-minimal-5.0.16/bin/bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
guix build: error: no build log for '/gnu/store/3i5qm6z0qihhjbdgs3pwj42gy63sf74h-ghostscript-9.27'

I ran the garbage collector guix gc and git clean -xdff --exclude='/depends/SDKs/*' and did another build (same hashes).

By the way, before I ran that clean command I got:

DISTSRC directory '/bitcoin/distsrc-x86_64-linux-gnu' exists, probably because of previous builds... Aborting...

It would be nice if e.g. guix-build.sh checked this at the start, and maybe offers to nuke it.

dongcarl · 2020-12-15T23:05:49Z

@Sjors Would you mind giving me more info on your setup? I'm particularly interested in what distro and kernel version you were using when you encountered:

guix install glibc-locales (as root, this would fail without substitutes)

Sjors · 2020-12-17T12:37:44Z

Ubuntu 20.04.1 LTS (GNU/Linux 5.4.0-33-generic x86_64)

I installed Guix as root using their guix-install.sh script. I have a user guix where I cloned this branch and from which I run the builds.

dongcarl · 2021-01-13T19:54:07Z

Pushed 0e5c7bf -> 05a31a9

Addressed guix: Build support for macOS #17920 (comment) and guix: Build support for macOS #17920 (comment)

Is there a reason this is still draft?

Nope!

fanquake · 2021-01-14T00:57:43Z

05a31a9

find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
3f2762da34e6681471a7ede52ff7739e0e5ad64dd4584ae1e6d4af47456c2a98  output/bitcoin-05a31a95832b-osx-unsigned.dmg
ffc15b01f5028bf15fda61c1b3d785c2ba6e72fdfdd3292ea7f7d7f0b5230f9f  output/bitcoin-05a31a95832b-osx-unsigned.tar.gz
538ba85976b7dec9353d9e246346cac792916ed2a59360c5ded8c7e4ddebe8b7  output/bitcoin-05a31a95832b-osx64.tar.gz
21118fd0183fc430fe6de82bbcd5ab353643fc51a280a11cb188e9e4ae7c7cd5  output/src/bitcoin-05a31a95832b.tar.gz

dongcarl · 2021-01-14T03:36:56Z

I'm getting matching hashes!

find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
3f2762da34e6681471a7ede52ff7739e0e5ad64dd4584ae1e6d4af47456c2a98  output/bitcoin-05a31a95832b-osx-unsigned.dmg
ffc15b01f5028bf15fda61c1b3d785c2ba6e72fdfdd3292ea7f7d7f0b5230f9f  output/bitcoin-05a31a95832b-osx-unsigned.tar.gz
538ba85976b7dec9353d9e246346cac792916ed2a59360c5ded8c7e4ddebe8b7  output/bitcoin-05a31a95832b-osx64.tar.gz
21118fd0183fc430fe6de82bbcd5ab353643fc51a280a11cb188e9e4ae7c7cd5  output/src/bitcoin-05a31a95832b.tar.gz

See 181989f for more info. I missed this one last time.

We need this to be after a '--' as '-volume_date' is a xorriso flag, not a xorrisofs flag. See the respective man pages. For more details: https://issues.guix.info/issue/35283#2

See comments inserted in this commit.

dongcarl · 2021-01-21T16:19:24Z

Pushed 05a31a9 -> f169475

Rebased over master
Fixed typo

Hashes:

2d17b6c787f91bf32e5d3732a6a054df1940d26030fc19d845ca0b472283a1bb  output/bitcoin-f1694757ddbc-osx-unsigned.dmg
c5a8207f4d76928b88ac9dfed61197be9bfd62ba93821898a9c90e1eb8a5a7d5  output/bitcoin-f1694757ddbc-osx-unsigned.tar.gz
bb972ac7f0f03c31d30c15cc9667530cd25f2237f4eb9d32cd3a1ea17ce1ff6a  output/bitcoin-f1694757ddbc-osx64.tar.gz
262cb14aabffdb98260ca53e5d420b14f4242c83e414963abf9c4798eba899b6  output/src/bitcoin-f1694757ddbc.tar.gz

fanquake · 2021-01-22T04:16:43Z

ACK f169475 - I think we can make some small usability improvements, but this is ok to merge now.

find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
2d17b6c787f91bf32e5d3732a6a054df1940d26030fc19d845ca0b472283a1bb  output/bitcoin-f1694757ddbc-osx-unsigned.dmg
c5a8207f4d76928b88ac9dfed61197be9bfd62ba93821898a9c90e1eb8a5a7d5  output/bitcoin-f1694757ddbc-osx-unsigned.tar.gz
bb972ac7f0f03c31d30c15cc9667530cd25f2237f4eb9d32cd3a1ea17ce1ff6a  output/bitcoin-f1694757ddbc-osx64.tar.gz
262cb14aabffdb98260ca53e5d420b14f4242c83e414963abf9c4798eba899b6  output/src/bitcoin-f1694757ddbc.tar.gz

maflcko · 2021-01-22T06:38:12Z

contrib/guix/manifest.scm

-        ;; Native gcc 9 toolchain targeting glibc 2.27
-        (make-gcc-toolchain gcc-9 glibc-2.27))
+        ;; Native gcc 7 toolchain
+        gcc-toolchain-7)


Why is this changed, seems unrelated to macos, no? Does this break gcc cross builds for our linux archs that need gcc 8 at least?

Btw, this is the comment I was referring to: #13665 (comment)

I presume that guix is using a gcc-7 that has a fix backported?

Sjors · 2021-01-22T19:20:23Z

Post merge test: I get the same checksums!

dongcarl added the Build system label Jan 13, 2020

fanquake reviewed Jan 14, 2020

View reviewed changes

dongcarl force-pushed the 2020-01-guix-macos branch from e61380a to fa7ea1b Compare January 23, 2020 21:33

dongcarl force-pushed the 2020-01-guix-macos branch 2 times, most recently from 20e9e0b to fa7ea1b Compare January 31, 2020 14:50

fanquake added this to the 0.21.0 milestone Mar 28, 2020

theuni mentioned this pull request Jul 10, 2020

depends: Allow building with system clang #17919

Merged

fanquake mentioned this pull request Jul 31, 2020

doc: Clang 8 or later is required with FORCE_USE_SYSTEM_CLANG #19617

Merged

laanwj modified the milestones: 0.21.0, 0.22.0 Oct 8, 2020

dongcarl force-pushed the 2020-01-guix-macos branch from fa7ea1b to d146976 Compare November 24, 2020 00:48

This was referenced Nov 24, 2020

build: Replace genisoimage with xorriso #20470

Merged

Replace boost::filesystem with std::filesystem #19245

Closed

Erlay: bandwidth-efficient transaction relay protocol #18261

Closed

build: use more legible (q)make commands in qt package #20504

Closed

dongcarl force-pushed the 2020-01-guix-macos branch 2 times, most recently from 173bb2d to 40ad768 Compare December 11, 2020 01:05

DrahtBot mentioned this pull request Dec 11, 2020

guix: Quality of life improvements #20619

Merged

This was referenced Dec 11, 2020

depends: Improve id string robustness #20629

Merged

build: Fix macOS code signing by pre-allocating space for the code signature during gitian build #20638

Closed

dongcarl force-pushed the 2020-01-guix-macos branch from 40ad768 to c811059 Compare December 23, 2020 16:24

dongcarl marked this pull request as ready for review January 13, 2021 19:55

maflcko added DrahtBot Guix build requested Needs gitian build and removed Needs gitian build labels Jan 14, 2021

DrahtBot mentioned this pull request Jan 15, 2021

guix: Make nsis reproducible by respecting SOURCE-DATE-EPOCH #20937

Merged

maflcko added Needs gitian build and removed Needs gitian build labels Jan 15, 2021

dongcarl added DrahtBot Guix build requested and removed DrahtBot Guix build requested labels Jan 17, 2021

DrahtBot added the Needs rebase label Jan 20, 2021

dongcarl added 7 commits January 21, 2021 10:57

build: Add var printing target to src/Makefile.am

37fe73a

See 181989f for more info. I missed this one last time.

guix: Add support for darwin builds

c9eb4cf

build: Make xorrisofs reproducible with -volume_date

f3835dc

We need this to be after a '--' as '-volume_date' is a xorriso flag, not a xorrisofs flag. See the respective man pages. For more details: https://issues.guix.info/issue/35283#2

guix: Set ZERO_AR_DATE for darwin build determinism

34b23f5

See comments inserted in this commit.

guix: Check for macOS SDK before building anything

8dbf18c

guix: README: Add darwin HOSTS entry

771c4b9

guix: Fix typo

f169475

dongcarl force-pushed the 2020-01-guix-macos branch from 05a31a9 to f169475 Compare January 21, 2021 16:18

DrahtBot removed the Needs rebase label Jan 21, 2021

fanquake merged commit 019aa24 into bitcoin:master Jan 22, 2021

maflcko reviewed Jan 22, 2021

View reviewed changes

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jan 22, 2021

Merge bitcoin#17920: guix: Build support for macOS

b47870b

maflcko removed the DrahtBot Guix build requested label Jan 28, 2021

bitcoin locked as resolved and limited conversation to collaborators Aug 18, 2022

guix: Build support for macOS #17920

guix: Build support for macOS #17920

Uh oh!

Conversation

dongcarl commented Jan 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DrahtBot commented Jan 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Conflicts

Uh oh!

fanquake left a comment

Choose a reason for hiding this comment

Uh oh!

fanquake Jan 14, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dongcarl commented Jul 30, 2020

Uh oh!

Sjors commented Dec 11, 2020

Uh oh!

dongcarl commented Dec 11, 2020

Uh oh!

Sjors commented Dec 13, 2020

Uh oh!

dongcarl commented Dec 14, 2020

Uh oh!

Sjors commented Dec 15, 2020

Uh oh!

dongcarl commented Dec 15, 2020

Uh oh!

Sjors commented Dec 17, 2020

Uh oh!

dongcarl commented Jan 13, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fanquake commented Jan 14, 2021

Uh oh!

dongcarl commented Jan 14, 2021

Uh oh!

dongcarl commented Jan 21, 2021

Uh oh!

fanquake commented Jan 22, 2021

Uh oh!

maflcko Jan 22, 2021

Choose a reason for hiding this comment

Uh oh!

maflcko Jan 23, 2021

Choose a reason for hiding this comment

Uh oh!

Sjors commented Jan 22, 2021

Uh oh!

Uh oh!

dongcarl commented Jan 13, 2020 •

edited

Loading

DrahtBot commented Jan 13, 2020 •

edited

Loading

dongcarl commented Jan 13, 2021 •

edited

Loading