glibc: 2.40-66 -> 2.42-47
Announcements: * https://lists.gnu.org/archive/html/info-gnu/2025-01/msg00014.html * https://lists.gnu.org/archive/html/info-gnu/2025-07/msg00011.html
This commit is contained in:
Maximilian Bosch
+19
-19
@@ -1,4 +1,4 @@
|
||||
From e207c3dbcff1d3d09c60eec99b6fec2a698b01bd Mon Sep 17 00:00:00 2001
|
||||
From c1c36f73aa3085a856c7cf36d69c21d18d3ef5ac Mon Sep 17 00:00:00 2001
|
||||
From: Bernardo Meurer <bernardo@meurer.org>
|
||||
Date: Fri, 22 Jul 2022 22:11:07 -0700
|
||||
Subject: [PATCH] Revert "Remove all usage of @BASH@ or ${BASH} in installed
|
||||
@@ -22,10 +22,10 @@ Co-authored-by: Maximilian Bosch <maximilian@mbosch.me>
|
||||
8 files changed, 15 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/debug/Makefile b/debug/Makefile
|
||||
index 3903cc97a3..b041acca71 100644
|
||||
index 6a05205ce6..dd63b16ae8 100644
|
||||
--- a/debug/Makefile
|
||||
+++ b/debug/Makefile
|
||||
@@ -343,8 +343,9 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o
|
||||
@@ -345,8 +345,9 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o
|
||||
|
||||
$(objpfx)xtrace: xtrace.sh
|
||||
rm -f $@.new
|
||||
@@ -38,20 +38,20 @@ index 3903cc97a3..b041acca71 100644
|
||||
&& rm -f $@ && mv $@.new $@ && chmod +x $@
|
||||
|
||||
diff --git a/debug/xtrace.sh b/debug/xtrace.sh
|
||||
index 77ec1d84df..5614404a71 100755
|
||||
index 00bafd33db..d0f9fca9a9 100755
|
||||
--- a/debug/xtrace.sh
|
||||
+++ b/debug/xtrace.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#! @BASH@
|
||||
# Copyright (C) 1999-2024 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2025 Free Software Foundation, Inc.
|
||||
# This file is part of the GNU C Library.
|
||||
|
||||
diff --git a/elf/Makefile b/elf/Makefile
|
||||
index 5d78b659ce..a2145d7b64 100644
|
||||
index 4b1d0d8741..bbcf688c99 100644
|
||||
--- a/elf/Makefile
|
||||
+++ b/elf/Makefile
|
||||
@@ -249,7 +249,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \
|
||||
@@ -250,7 +250,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \
|
||||
$(common-objpfx)libc_nonshared.a
|
||||
|
||||
$(objpfx)sotruss: sotruss.sh $(common-objpfx)config.make
|
||||
@@ -61,7 +61,7 @@ index 5d78b659ce..a2145d7b64 100644
|
||||
-e 's%@TEXTDOMAINDIR@%$(localedir)%g' \
|
||||
-e 's%@PREFIX@%$(prefix)%g' \
|
||||
-e 's|@PKGVERSION@|$(PKGVERSION)|g' \
|
||||
@@ -1392,6 +1393,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
|
||||
@@ -1556,6 +1557,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
|
||||
-e 's%@VERSION@%$(version)%g' \
|
||||
-e 's|@PKGVERSION@|$(PKGVERSION)|g' \
|
||||
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \
|
||||
@@ -70,30 +70,30 @@ index 5d78b659ce..a2145d7b64 100644
|
||||
|
||||
ifeq ($(ldd-rewrite-script),no)
|
||||
diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
|
||||
index d6b640df66..46111670cd 100644
|
||||
index 2d3df6e57e..0faf83dc86 100644
|
||||
--- a/elf/ldd.bash.in
|
||||
+++ b/elf/ldd.bash.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#! @BASH@
|
||||
# Copyright (C) 1996-2024 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996-2025 Free Software Foundation, Inc.
|
||||
# This file is part of the GNU C Library.
|
||||
|
||||
diff --git a/elf/sotruss.sh b/elf/sotruss.sh
|
||||
index ac1a83984e..2bf17c518e 100755
|
||||
index 8944645df9..1c36981b22 100755
|
||||
--- a/elf/sotruss.sh
|
||||
+++ b/elf/sotruss.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#! @BASH@
|
||||
# Copyright (C) 2011-2024 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2011-2025 Free Software Foundation, Inc.
|
||||
# This file is part of the GNU C Library.
|
||||
|
||||
diff --git a/malloc/Makefile b/malloc/Makefile
|
||||
index c83ade5f10..8dd9174b79 100644
|
||||
index e2b2c1ae1b..67a399f1dd 100644
|
||||
--- a/malloc/Makefile
|
||||
+++ b/malloc/Makefile
|
||||
@@ -312,8 +312,9 @@ $(objpfx)mtrace: mtrace.pl
|
||||
@@ -359,8 +359,9 @@ $(objpfx)mtrace: mtrace.pl
|
||||
|
||||
$(objpfx)memusage: memusage.sh
|
||||
rm -f $@.new
|
||||
@@ -106,20 +106,20 @@ index c83ade5f10..8dd9174b79 100644
|
||||
&& rm -f $@ && mv $@.new $@ && chmod +x $@
|
||||
|
||||
diff --git a/malloc/memusage.sh b/malloc/memusage.sh
|
||||
index d2d9d17ea8..2e7efc9049 100755
|
||||
index 8ae435d2f8..c929d16af7 100755
|
||||
--- a/malloc/memusage.sh
|
||||
+++ b/malloc/memusage.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#! @BASH@
|
||||
# Copyright (C) 1999-2024 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2025 Free Software Foundation, Inc.
|
||||
# This file is part of the GNU C Library.
|
||||
|
||||
diff --git a/timezone/Makefile b/timezone/Makefile
|
||||
index d7acb387ba..c8e203ea3a 100644
|
||||
index ebe5cf73a1..e9cf92861c 100644
|
||||
--- a/timezone/Makefile
|
||||
+++ b/timezone/Makefile
|
||||
@@ -132,7 +132,8 @@ $(testdata)/XT5: testdata/gen-XT5.sh
|
||||
@@ -139,7 +139,8 @@ $(testdata)/XT5: testdata/gen-XT5.sh
|
||||
mv $@.tmp $@
|
||||
|
||||
$(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
|
||||
@@ -130,5 +130,5 @@ index d7acb387ba..c8e203ea3a 100644
|
||||
-e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
|
||||
-e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \
|
||||
--
|
||||
2.42.0
|
||||
2.47.2
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -49,9 +49,9 @@
|
||||
}@args:
|
||||
|
||||
let
|
||||
version = "2.40";
|
||||
patchSuffix = "-66";
|
||||
sha256 = "sha256-GaiQF16SY9dI9ieZPeb0sa+c0h4D8IDkv7Oh+sECBaI=";
|
||||
version = "2.42";
|
||||
patchSuffix = "-47";
|
||||
sha256 = "sha256-0XdeMuRijmTvkw9DW2e7Y691may2viszW58Z8WUJ8X8=";
|
||||
in
|
||||
|
||||
assert withLinuxHeaders -> linuxHeaders != null;
|
||||
@@ -68,17 +68,17 @@ stdenv.mkDerivation (
|
||||
/*
|
||||
No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
|
||||
$ git fetch --all -p && git checkout origin/release/2.40/master && git describe
|
||||
glibc-2.40-142-g2eb180377b
|
||||
$ git show --minimal --reverse glibc-2.40.. ':!ADVISORIES' > 2.40-master.patch
|
||||
glibc-2.42-47-ga1d3294a5b
|
||||
$ git show --minimal --reverse glibc-2.42.. ':!ADVISORIES' > 2.42-master.patch
|
||||
|
||||
To compare the archive contents zdiff can be used.
|
||||
$ diff -u 2.40-master.patch ../nixpkgs/pkgs/development/libraries/glibc/2.40-master.patch
|
||||
$ diff -u 2.42-master.patch ../nixpkgs/pkgs/development/libraries/glibc/2.42-master.patch
|
||||
|
||||
Please note that each commit has changes to the file ADVISORIES excluded since
|
||||
that conflicts with the directory advisories/ making cross-builds from
|
||||
hosts with case-insensitive file-systems impossible.
|
||||
*/
|
||||
./2.40-master.patch
|
||||
./2.42-master.patch
|
||||
|
||||
# Allow NixOS and Nix to handle the locale-archive.
|
||||
./nix-locale-archive.patch
|
||||
@@ -164,15 +164,6 @@ stdenv.mkDerivation (
|
||||
-#define LIBIDN2_SONAME "libidn2.so.0"
|
||||
+#define LIBIDN2_SONAME "${lib.getLib libidn2}/lib/libidn2.so.0"
|
||||
EOF
|
||||
''
|
||||
# For some reason, with gcc-15 build fails with the following error:
|
||||
#
|
||||
# zic.c:3767:1: note: did you mean to specify it after ')' following function parameters?
|
||||
# zic.c:3781:1: error: standard 'reproducible' attribute can only be applied to function declarators or type specifiers with function type []
|
||||
+ ''
|
||||
for path in timezone/zic.c timezone/zdump.c ; do
|
||||
substituteInPlace $path --replace-fail "ATTRIBUTE_REPRODUCIBLE" ""
|
||||
done
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
|
||||
Reference in New Issue
Block a user