Skip to content

glibc: 2.34-115 -> 2.35-30 #165979

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.

Sign up for GitHub

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

Closed
Ma27 wants to merge 2 commits into from
Closed

glibc: 2.34-115 -> 2.35-30 #165979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
074b5a7
glibc: 2.34-115 -> 2.35-30
Ma27 Mar 27, 2022
c25c0bf
gdb: fix build w/glibc-2.35
Ma27 Mar 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...velopment/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ index 9697fbe0b4..279fe59ac6 100755
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! @BASH@
# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Copyright (C) 1999-2022 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Ulrich Drepper <drepper@gnu.org>, 1999.
diff --git a/elf/Makefile b/elf/Makefile
Expand Down Expand Up @@ -73,7 +73,7 @@ index ba736464ac..57442bc3f2 100644
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! @BASH@
# Copyright (C) 1996-2021 Free Software Foundation, Inc.
# Copyright (C) 1996-2022 Free Software Foundation, Inc.
# This file is part of the GNU C Library.

diff --git a/elf/sotruss.sh b/elf/sotruss.sh
Expand All @@ -83,7 +83,7 @@ index 003cf4d825..fd4da80244 100755
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! @BASH@
# Copyright (C) 2011-2021 Free Software Foundation, Inc.
# Copyright (C) 2011-2022 Free Software Foundation, Inc.
# This file is part of the GNU C Library.

diff --git a/malloc/Makefile b/malloc/Makefile
Expand All @@ -109,7 +109,7 @@ index 0645f09911..c1cd4e23b7 100755
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! @BASH@
# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Copyright (C) 1999-2022 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Ulrich Drepper <drepper@gnu.org>, 1999.
diff --git a/timezone/Makefile b/timezone/Makefile
Expand Down
Binary file added pkgs/development/libraries/glibc/2.35-master.patch.gz
View file
Open in desktop
Binary file not shown.
22 changes: 8 additions & 14 deletions pkgs/development/libraries/glibc/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
} @ args:

let
version = "2.34";
patchSuffix = "-115";
sha256 = "sha256-RNJqH+ILiFOkj0cOrQHkJ56GmsFJsZXdpORKGV2YGrI=";
version = "2.35";
patchSuffix = "-30";
sha256 = "sha256-USNzL2tnzNMZMF79OZlx1YWSEivMKmUYob0lEN0M9S4=";
in

assert withLinuxHeaders -> linuxHeaders != null;
Expand All @@ -62,14 +62,14 @@ stdenv.mkDerivation ({
patches =
[
/* 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.34/master && git describe
glibc-2.34-115-gd5d1c95aaf
$ git show --minimal --reverse glibc-2.34.. | gzip -9n --rsyncable - > 2.34-master.patch.gz
$ git fetch --all -p && git checkout origin/release/2.35/master && git describe
glibc-2.35-30-g9be62976af
$ git show --minimal --reverse glibc-2.35.. | gzip -9n --rsyncable - > 2.35-master.patch.gz

To compare the archive contents zdiff can be used.
$ zdiff -u 2.34-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.34-master.patch.gz
$ zdiff -u 2.35-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.35-master.patch.gz
*/
./2.34-master.patch.gz
./2.35-master.patch.gz
Comment on lines -65 to +72
Copy link
Contributor

@vobloeb vobloeb May 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not fetchpatch { url = "https://github.com/bminor/glibc/compare/glibc-2.35..9be62976af.patch"; hash = ...; } ?

Copy link
Member

@ajs124 ajs124 May 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't work. Can't fetchpatch while bootstrapping.

Copy link
Contributor

@vobloeb vobloeb May 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fetchurl then

Copy link
Member

@vcunat vcunat May 9, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That won't give a stable hash IIRC.


/* Allow NixOS and Nix to handle the locale-archive. */
./nix-locale-archive.patch
Expand Down Expand Up @@ -115,12 +115,6 @@ stdenv.mkDerivation ({
sha256 = "091bk3kyrx1gc380gryrxjzgcmh1ajcj8s2rjhp2d2yzd5mpd5ps";
})

/* Provide utf-8 locales by default, so we can use it in stdenv without depending on our large locale-archive. */
(fetchurl {
url = "https://salsa.debian.org/glibc-team/glibc/raw/49767c9f7de4828220b691b29de0baf60d8a54ec/debian/patches/localedata/locale-C.diff";
sha256 = "0irj60hs2i91ilwg5w7sqrxb695c93xg0ik7yhhq9irprd7fidn4";
})

./fix-x64-abi.patch

/* https://github.com/NixOS/nixpkgs/pull/137601 */
Expand Down
8 changes: 8 additions & 0 deletions pkgs/development/tools/misc/gdb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ stdenv.mkDerivation rec {
url = "https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=e97436b1b789dcdb6ffb502263f4c86f8bc22996";
sha256 = "1mpgw6s9qgnwhwyg3hagc6vhqhvia0l1s8nr22bcahwqxi3wvzcw";
})

# glibc-2.35 compat
(fetchpatch {
name = "glibc-2.35-compat.patch";
url = "https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=a532eb7277ff64fb073e209d418b0a97f686c0e3";
sha256 = "sha256-XEMv2itTh5PitcJzd6EQ3t4F9oOKGHBcUhdvp0DoYK0=";
excludes = [ "opcodes/ChangeLog" ];
})
] ++ lib.optionals stdenv.isDarwin [
./darwin-target-match.patch
] ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
Expand Down