Skip to content

Commit fc7b214

Browse files
committed
Merge bitcoin/bitcoin#31529: guix: latest 2.31 glibc
b871020 guix: disable timezone tools & profiling in glibc (fanquake) 23b8a42 guix: bump glibc 2.31 to 7b27c450c34563a28e634cccb399cd415e71ebfe (fanquake) Pull request description: An additional commit has been backported to the 2.31 branch: https://sourceware.org/git/?p=glibc.git;a=shortlog;h=refs/heads/release/2.31/master. Pass `--disable-timezone-tools`: removes `var/profiles/x86_64-linux-gnu/sbin/zdump`. Pass `--disable-profile`: profiling is disabled by default, but make that explicit. ACKs for top commit: theuni: utACK b871020 hebasto: ACK b871020. Tree-SHA512: 0d9a0e7451cc42384bbdd0b46c740c7aa964dc12e3f0376de586bf90e57799ebb04675892861cb38a53b5ca0e265061fa7111596cf1c94171303d0d048785ab4
2 parents 273440d + b871020 commit fc7b214

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

contrib/guix/manifest.scm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ inspecting signatures in Mach-O binaries.")
451451
#t))))))))
452452

453453
(define-public glibc-2.31
454-
(let ((commit "8e30f03744837a85e33d84ccd34ed3abe30d37c3"))
454+
(let ((commit "7b27c450c34563a28e634cccb399cd415e71ebfe"))
455455
(package
456456
(inherit glibc) ;; 2.35
457457
(version "2.31")
@@ -463,7 +463,7 @@ inspecting signatures in Mach-O binaries.")
463463
(file-name (git-file-name "glibc" commit))
464464
(sha256
465465
(base32
466-
"1zi0s9yy5zkisw823vivn7zlj8w6g9p3mm7lmlqiixcxdkz4dbn6"))
466+
"017qdpr5id7ddb4lpkzj2li1abvw916m3fc6n7nw28z4h5qbv2n0"))
467467
(patches (search-our-patches "glibc-guix-prefix.patch"))))
468468
(arguments
469469
(substitute-keyword-arguments (package-arguments glibc)
@@ -474,6 +474,8 @@ inspecting signatures in Mach-O binaries.")
474474
"--enable-cet",
475475
"--enable-bind-now",
476476
"--disable-werror",
477+
"--disable-timezone-tools",
478+
"--disable-profile",
477479
building-on)))
478480
((#:phases phases)
479481
`(modify-phases ,phases

0 commit comments

Comments
 (0)