-
Notifications
You must be signed in to change notification settings - Fork 37.7k
guix: Bump time-machine, glibc, and linux-headers #21298
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.
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
Conversation
A few changes which are useful for us: 1. 'gnu: cross-gcc-arguments: Enable 128 bit long double for POWER9.' is now merged into master. 2. gnutls is bumped to 3.6.15 and the temporal test failure in status-request-revoked is fixed. Note that this does not fix the case where one has installed Guix v1.2.0 and is running a substitute-less bootstrap build, since the `guix time-machine` command itself has a dependency on gnutls v3.6.12 (the one with the broken test) and will thus try to build it before attempting to jump forwards in time. This does however, mean that those who build a version of Guix that also contains this fix will not go backwards in time to build the broken gnutls v3.6.12.
Bump glibc and linux-headers to match those of our Gitian counterparts. We also require a glibc >= 2.28 for the test-symbol-check scripts to work properly. The default BASE-GCC-FOR-LIBC also has to be bumped since glibc 2.31 requires a gcc >= 6.2
This is about the floating point type, right, not Concept ACK otherwise of course, will do a build. |
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
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. |
Builds at c33b199: bash-5.1# guix describe
Generation 6 Feb 23 2021 03:15:31 (current)
guix 11f11d7
repository URL: https://git.savannah.gnu.org/git/guix.git
branch: master
commit: 11f11d7ecb817d1421f8b5340bcced59396d8708
bash-5.1# git rev-parse HEAD
c33b199456e57d83c21eacd36d3c56d0a123b0d0
bash-5.1# find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
bb2b44203b4af1625e1c9b07f4e85c22b5e337090c5e765bc574b5502cd77f92 output/bitcoin-c33b199456e5-aarch64-linux-gnu-debug.tar.gz
6f60c9a48099338900db97095a7e583282335f8c423e0ad9eb25c33243be09e8 output/bitcoin-c33b199456e5-aarch64-linux-gnu.tar.gz
6cd56b320a8ff3daf79d3939485bb39c0d8c55b9296e2af09739cd3e47c522b6 output/bitcoin-c33b199456e5-arm-linux-gnueabihf-debug.tar.gz
8e26711bc2619f2fda91f0b9182ee3a8b80766b8e9c9a21cbe56a897dc87aa06 output/bitcoin-c33b199456e5-arm-linux-gnueabihf.tar.gz
35df83ad514e980e734680136ae58eb8ec2bd8db8147d55c66a4fc6ee4fd80d2 output/bitcoin-c33b199456e5-osx-unsigned.dmg
6b1b69b3831b2af5702713aa28e733397d4560a173f5da86b5b42aee5a3507de output/bitcoin-c33b199456e5-osx-unsigned.tar.gz
febde5b7d1844ab686716fe9532111c8628e8be31e9ca3768baf54d758f63075 output/bitcoin-c33b199456e5-osx64.tar.gz
5768f5eda41aaf5b443f13aa81d1c78111cdb3ca606374254473e13e2ecf2efe output/bitcoin-c33b199456e5-powerpc64-linux-gnu-debug.tar.gz
b6a0af9a6164e7482ccca85b55fc49d6873734667fca0ce8f620e35137712cf2 output/bitcoin-c33b199456e5-powerpc64-linux-gnu.tar.gz
90f8d024ca5a13cba084caba4548cb98254639e2eb7918e75862a34688e4b63a output/bitcoin-c33b199456e5-powerpc64le-linux-gnu-debug.tar.gz
5278e69c06416c905f0fb4f15145a707ca90d555e82c1c96b988249a1ec9b5de output/bitcoin-c33b199456e5-powerpc64le-linux-gnu.tar.gz
e4900927db72cc735cd1c221671b1edcfff84236246dd1e352571f102e2173f6 output/bitcoin-c33b199456e5-riscv64-linux-gnu-debug.tar.gz
1658fc94fce4568dd5b67af6b7a9dd2f063093273bc0f23a6255b912d600f69e output/bitcoin-c33b199456e5-riscv64-linux-gnu.tar.gz
f65ef72789ab07352b5bd979ae18ff9f7a6ac01149e6f6c55329deb89516c4bf output/bitcoin-c33b199456e5-win-unsigned.tar.gz
8aaef7683c89f3eaca7938fed7db22b298d8604c4c684ab627425d5adfc0aabf output/bitcoin-c33b199456e5-win64-debug.zip
a8bc78c942f2393186763668806a93b0e931f5d7572be4e471a77de6283ca507 output/bitcoin-c33b199456e5-win64-setup-unsigned.exe
85675b096b3d15e1d8ceb4b085ec13f161c323143f949a42701b9676e6e0ce7d output/bitcoin-c33b199456e5-win64.zip
cc97540d65f31ee492af9d30f687f7ea93dcd18f256f5430427f370560798069 output/bitcoin-c33b199456e5-x86_64-linux-gnu-debug.tar.gz
6565c7fc7fa6604150a0dbb54438493ae2acf1bdb1a2e846cef87894e79202ac output/bitcoin-c33b199456e5-x86_64-linux-gnu.tar.gz
30a584b15c406e76e784bc81aace6db7eac0642da8c289bd3009d071510266d9 output/src/bitcoin-c33b199456e5.tar.gz |
I am wondering what is the best way to review this. Maybe you could share a command that prints the diff of the packages we use in the build that are affected as part of the bump? |
Actually, according to the comment in that commit, we do need it: "on POWER9 (little endian) glibc needs the 128 bit long double type." I've also ran into this problem before when naively compiling powerpc64le glibc with a gcc that was not configured with |
I've asked on #guix IRC, and there doesn't seem to be a built-in way to do this yet. The only close approximation is: $ guix time-machine --commit=6c9d16db962a6f7155571b36eced681fd2889e23 \
--url=https://github.com/dongcarl/guix.git \
-- pull --dry-run --news \
--commit=490e39ff303f4f6873a04bfb8253755bdae1b29c \
--url=https://github.com/dongcarl/guix.git However that shows the news for every single package changed between two commits... I will add this to my notes, as I suspect what you're asking for can be scripted in Guile without too many modifications to Guix itself. |
Ubuntu 21.04 on x86_64 machine; guix 1.2.0 installed through package manager.
|
My build output. Checked they match @sipa and @fanquake's
|
My Debian VM with guix-master-branch-built-from-source has a mismatch on @dongcarl is looking into what is causing the difference. |
Since even gitian is using |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this PR is ready for merge, I've noted two things that needs attention that are separate from this PR:
|
|
Does this sound a little dubious just to me? |
@hebasto Sorry, I should have been more specific, here is the check that fails: bitcoin/contrib/devtools/test-symbol-check.py Lines 12 to 45 in 3f56ef7
The call to
but when building against a toolchain with glibc < 2.28, the compilation will fail earlier:
|
On bumping the time-machine:
On bumping the rest:
This is a prerequisite for #20980