From 23b8a424fb06d2e669d147b4f58e640b6eab646a Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 14 Nov 2024 11:02:15 +0000 Subject: [PATCH 1/2] guix: bump glibc 2.31 to 7b27c450c34563a28e634cccb399cd415e71ebfe 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. --- contrib/guix/manifest.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 8854cfef3030d..74e845fc836e9 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -451,7 +451,7 @@ inspecting signatures in Mach-O binaries.") #t)))))))) (define-public glibc-2.31 - (let ((commit "8e30f03744837a85e33d84ccd34ed3abe30d37c3")) + (let ((commit "7b27c450c34563a28e634cccb399cd415e71ebfe")) (package (inherit glibc) ;; 2.35 (version "2.31") @@ -463,7 +463,7 @@ inspecting signatures in Mach-O binaries.") (file-name (git-file-name "glibc" commit)) (sha256 (base32 - "1zi0s9yy5zkisw823vivn7zlj8w6g9p3mm7lmlqiixcxdkz4dbn6")) + "017qdpr5id7ddb4lpkzj2li1abvw916m3fc6n7nw28z4h5qbv2n0")) (patches (search-our-patches "glibc-guix-prefix.patch")))) (arguments (substitute-keyword-arguments (package-arguments glibc) From b8710201fbd01bf2cba3c3b1fd312316b1ae22af Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 14 Nov 2024 11:02:32 +0000 Subject: [PATCH 2/2] guix: disable timezone tools & profiling in glibc Removes `var/profiles/x86_64-linux-gnu/sbin/zdump`. Profiling is disabled by default, but make that explicit. --- contrib/guix/manifest.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 74e845fc836e9..3244a8dbdc4f8 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -474,6 +474,8 @@ inspecting signatures in Mach-O binaries.") "--enable-cet", "--enable-bind-now", "--disable-werror", + "--disable-timezone-tools", + "--disable-profile", building-on))) ((#:phases phases) `(modify-phases ,phases