Skip to content

Conversation

dongcarl
Copy link
Contributor

This is a usability improvement for Guix builders so that they don't have to extract the Xcode tarball into depends/SDKs every time.

Inspiration: #21089 (comment)

@dongcarl dongcarl force-pushed the 2021-02-guix-SDK-specify branch from bc937df to 13a9fd1 Compare February 23, 2021 03:07
@dongcarl
Copy link
Contributor Author

dongcarl commented Feb 23, 2021

Pushed bc937df13a9fd1

  • Rebased on top of master
$ find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
1df79c6940ba516e30eaa00806bde38aed2dadb613571bd501658be621b72e6e  output/bitcoin-13a9fd11a507-aarch64-linux-gnu-debug.tar.gz
7da347dab51141fa323c95ee590388b81898508c95c5e41a36149cff7e0f9f89  output/bitcoin-13a9fd11a507-aarch64-linux-gnu.tar.gz
9fd725c599ee043525c3e8a1adf68a463e2b079f7d09f0619103da7ffcbaad72  output/bitcoin-13a9fd11a507-arm-linux-gnueabihf-debug.tar.gz
1b580701e32ac55d7b45ff2e4e372596664c8bc85a683b2ba14a4e1516a9e097  output/bitcoin-13a9fd11a507-arm-linux-gnueabihf.tar.gz
390d513d6d831a30c43b07a77dbf90b164e62abeb8fddb8bfcf12daf858120b4  output/bitcoin-13a9fd11a507-osx-unsigned.dmg
9d327d7278f99f2e3f257fe1710e5bf2e5a2d4ae9c75285ca9cdbecd827ae0ac  output/bitcoin-13a9fd11a507-osx-unsigned.tar.gz
a8e965f3bfc7d9e2a4e52355c4db327edd18cac5da1690ad857c848f566b741d  output/bitcoin-13a9fd11a507-osx64.tar.gz
0f5bdbe5348dd2e57d5d000eddba21a60e2302676c0514226a0ef3d3443ca8fe  output/bitcoin-13a9fd11a507-powerpc64-linux-gnu-debug.tar.gz
ac22d102d3ccf2b5478d97c47a29b23ed7eb5768533a7608064c469d9ecf40d7  output/bitcoin-13a9fd11a507-powerpc64-linux-gnu.tar.gz
7a16390bc242e09e69e68a774e455071df1c912af383f7e0e597c4678daf2bac  output/bitcoin-13a9fd11a507-powerpc64le-linux-gnu-debug.tar.gz
488cc56432f41b619a5a0b136c15114776ccb4c679eae4763f32e90d3a0392fc  output/bitcoin-13a9fd11a507-powerpc64le-linux-gnu.tar.gz
2c886276f6228d16579523df19890a9c7831d5b261328f2945ff12c311c49018  output/bitcoin-13a9fd11a507-riscv64-linux-gnu-debug.tar.gz
8cba8ae7c8c29c7642a0d255c8cde3e7bd09ef67488cda2d726cd381e136a1d7  output/bitcoin-13a9fd11a507-riscv64-linux-gnu.tar.gz
31c32015edf74a7b7893fb1ecf9a9020e93abed05f24b9c8487f57f608b23885  output/bitcoin-13a9fd11a507-win-unsigned.tar.gz
a702c122774a664ce561c88c9310553584bc7c59528b2b4a419ce40efe41060c  output/bitcoin-13a9fd11a507-win64-debug.zip
249e2f745af80cfd1b7623dd5e8be8b5e830aec8cb45b3e8fa03fbd5bed63960  output/bitcoin-13a9fd11a507-win64-setup-unsigned.exe
b997537e3193b3ed0ff70504d1424e59673042b3c26483e4c88981eaf27ba95c  output/bitcoin-13a9fd11a507-win64.zip
123214088c736da5f61143970af6a0c7ee8f930671e99008d76c8cd45460a01b  output/bitcoin-13a9fd11a507-x86_64-linux-gnu-debug.tar.gz
19cc5de18d298b3a957b21e3a63f8ce527540d99da70283df1b31c51c347fed9  output/bitcoin-13a9fd11a507-x86_64-linux-gnu.tar.gz
debc7546e0d8468014aec2d1ae2b28f8088e486b2dcbe84838a680cb8456bed0  output/src/bitcoin-13a9fd11a507.tar.gz

@laanwj
Copy link
Member

laanwj commented Feb 26, 2021

Concept ACK, will do a build to test this new feature

@laanwj
Copy link
Member

laanwj commented Feb 26, 2021

Tested ACK 13a9fd1
Checked that SDK_PATH is correctly used.
And I get the same output:

1df79c6940ba516e30eaa00806bde38aed2dadb613571bd501658be621b72e6e  output/bitcoin-13a9fd11a507-aarch64-linux-gnu-debug.tar.gz
7da347dab51141fa323c95ee590388b81898508c95c5e41a36149cff7e0f9f89  output/bitcoin-13a9fd11a507-aarch64-linux-gnu.tar.gz
9fd725c599ee043525c3e8a1adf68a463e2b079f7d09f0619103da7ffcbaad72  output/bitcoin-13a9fd11a507-arm-linux-gnueabihf-debug.tar.gz
1b580701e32ac55d7b45ff2e4e372596664c8bc85a683b2ba14a4e1516a9e097  output/bitcoin-13a9fd11a507-arm-linux-gnueabihf.tar.gz
390d513d6d831a30c43b07a77dbf90b164e62abeb8fddb8bfcf12daf858120b4  output/bitcoin-13a9fd11a507-osx-unsigned.dmg
9d327d7278f99f2e3f257fe1710e5bf2e5a2d4ae9c75285ca9cdbecd827ae0ac  output/bitcoin-13a9fd11a507-osx-unsigned.tar.gz
a8e965f3bfc7d9e2a4e52355c4db327edd18cac5da1690ad857c848f566b741d  output/bitcoin-13a9fd11a507-osx64.tar.gz
0f5bdbe5348dd2e57d5d000eddba21a60e2302676c0514226a0ef3d3443ca8fe  output/bitcoin-13a9fd11a507-powerpc64-linux-gnu-debug.tar.gz
ac22d102d3ccf2b5478d97c47a29b23ed7eb5768533a7608064c469d9ecf40d7  output/bitcoin-13a9fd11a507-powerpc64-linux-gnu.tar.gz
7a16390bc242e09e69e68a774e455071df1c912af383f7e0e597c4678daf2bac  output/bitcoin-13a9fd11a507-powerpc64le-linux-gnu-debug.tar.gz
488cc56432f41b619a5a0b136c15114776ccb4c679eae4763f32e90d3a0392fc  output/bitcoin-13a9fd11a507-powerpc64le-linux-gnu.tar.gz
2c886276f6228d16579523df19890a9c7831d5b261328f2945ff12c311c49018  output/bitcoin-13a9fd11a507-riscv64-linux-gnu-debug.tar.gz
8cba8ae7c8c29c7642a0d255c8cde3e7bd09ef67488cda2d726cd381e136a1d7  output/bitcoin-13a9fd11a507-riscv64-linux-gnu.tar.gz
31c32015edf74a7b7893fb1ecf9a9020e93abed05f24b9c8487f57f608b23885  output/bitcoin-13a9fd11a507-win-unsigned.tar.gz
a702c122774a664ce561c88c9310553584bc7c59528b2b4a419ce40efe41060c  output/bitcoin-13a9fd11a507-win64-debug.zip
249e2f745af80cfd1b7623dd5e8be8b5e830aec8cb45b3e8fa03fbd5bed63960  output/bitcoin-13a9fd11a507-win64-setup-unsigned.exe
b997537e3193b3ed0ff70504d1424e59673042b3c26483e4c88981eaf27ba95c  output/bitcoin-13a9fd11a507-win64.zip
123214088c736da5f61143970af6a0c7ee8f930671e99008d76c8cd45460a01b  output/bitcoin-13a9fd11a507-x86_64-linux-gnu-debug.tar.gz
19cc5de18d298b3a957b21e3a63f8ce527540d99da70283df1b31c51c347fed9  output/bitcoin-13a9fd11a507-x86_64-linux-gnu.tar.gz
debc7546e0d8468014aec2d1ae2b28f8088e486b2dcbe84838a680cb8456bed0  output/src/bitcoin-13a9fd11a507.tar.gz

@laanwj laanwj merged commit 5ba5bec into bitcoin:master Feb 26, 2021
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Feb 26, 2021
13a9fd1 guix: Passthrough SDK_PATH into container (Carl Dong)

Pull request description:

  This is a usability improvement for Guix builders so that they don't have to extract the Xcode tarball into `depends/SDKs` every time.

  Inspiration: bitcoin#21089 (comment)

ACKs for top commit:
  laanwj:
    Tested ACK 13a9fd1

Tree-SHA512: 63392d537e48a0da9f0ee04a929613b139bef1ac5643187871c9ea5376afd2a3d95df0f5e0950ae0eccd2813b166667be98401e5a248ae9c187fe4e84e54d427
@hebasto
Copy link
Member

hebasto commented Mar 1, 2021

$ lsb_release -dc
Description:	Ubuntu Hirsute Hippo (development branch)
Codename:	hirsute
$ time ./contrib/guix/guix-build.sh
...
real	180m12,421s
user	481m53,191s
sys	41m32,871s
$ find output/ -type f -print0 | sort -z | xargs -r0 sha256sum
1df79c6940ba516e30eaa00806bde38aed2dadb613571bd501658be621b72e6e  output/bitcoin-13a9fd11a507-aarch64-linux-gnu-debug.tar.gz
7da347dab51141fa323c95ee590388b81898508c95c5e41a36149cff7e0f9f89  output/bitcoin-13a9fd11a507-aarch64-linux-gnu.tar.gz
9fd725c599ee043525c3e8a1adf68a463e2b079f7d09f0619103da7ffcbaad72  output/bitcoin-13a9fd11a507-arm-linux-gnueabihf-debug.tar.gz
1b580701e32ac55d7b45ff2e4e372596664c8bc85a683b2ba14a4e1516a9e097  output/bitcoin-13a9fd11a507-arm-linux-gnueabihf.tar.gz
a8e965f3bfc7d9e2a4e52355c4db327edd18cac5da1690ad857c848f566b741d  output/bitcoin-13a9fd11a507-osx64.tar.gz
390d513d6d831a30c43b07a77dbf90b164e62abeb8fddb8bfcf12daf858120b4  output/bitcoin-13a9fd11a507-osx-unsigned.dmg
9d327d7278f99f2e3f257fe1710e5bf2e5a2d4ae9c75285ca9cdbecd827ae0ac  output/bitcoin-13a9fd11a507-osx-unsigned.tar.gz
7a16390bc242e09e69e68a774e455071df1c912af383f7e0e597c4678daf2bac  output/bitcoin-13a9fd11a507-powerpc64le-linux-gnu-debug.tar.gz
488cc56432f41b619a5a0b136c15114776ccb4c679eae4763f32e90d3a0392fc  output/bitcoin-13a9fd11a507-powerpc64le-linux-gnu.tar.gz
0f5bdbe5348dd2e57d5d000eddba21a60e2302676c0514226a0ef3d3443ca8fe  output/bitcoin-13a9fd11a507-powerpc64-linux-gnu-debug.tar.gz
ac22d102d3ccf2b5478d97c47a29b23ed7eb5768533a7608064c469d9ecf40d7  output/bitcoin-13a9fd11a507-powerpc64-linux-gnu.tar.gz
2c886276f6228d16579523df19890a9c7831d5b261328f2945ff12c311c49018  output/bitcoin-13a9fd11a507-riscv64-linux-gnu-debug.tar.gz
8cba8ae7c8c29c7642a0d255c8cde3e7bd09ef67488cda2d726cd381e136a1d7  output/bitcoin-13a9fd11a507-riscv64-linux-gnu.tar.gz
27d570a964b256e70eb94ffe50f6fe21237cfec26c9ae498f6297a45c960f710  output/bitcoin-13a9fd11a507-win64-debug.zip
249e2f745af80cfd1b7623dd5e8be8b5e830aec8cb45b3e8fa03fbd5bed63960  output/bitcoin-13a9fd11a507-win64-setup-unsigned.exe
5d0ba95e7a74c2ec75641bbe5b93609fbf82cd0035cf24dc18ae92afea73f257  output/bitcoin-13a9fd11a507-win64.zip
31c32015edf74a7b7893fb1ecf9a9020e93abed05f24b9c8487f57f608b23885  output/bitcoin-13a9fd11a507-win-unsigned.tar.gz
123214088c736da5f61143970af6a0c7ee8f930671e99008d76c8cd45460a01b  output/bitcoin-13a9fd11a507-x86_64-linux-gnu-debug.tar.gz
19cc5de18d298b3a957b21e3a63f8ce527540d99da70283df1b31c51c347fed9  output/bitcoin-13a9fd11a507-x86_64-linux-gnu.tar.gz
debc7546e0d8468014aec2d1ae2b28f8088e486b2dcbe84838a680cb8456bed0  output/src/bitcoin-13a9fd11a507.tar.gz

@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
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.

4 participants