nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 08:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

glibc: 2.39-52 -> 2.40-36 (#342073)

Browse Source
This commit is contained in:
K900 2024-09-20 19:42:37 +03:00 committed by GitHub
commit 5a9d1835e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 5147 additions and 10866 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/common/builder.nix
View File

@ -302,7 +302,7 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
fi
# Get rid of some "fixed" header files
rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h}
rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h}
# Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
for i in $out/bin/*-gcc*; do

13
pkgs/development/compilers/llvm/common/default.nix
View File

@ -495,7 +495,18 @@ let
stripLen = 1;
hash = "sha256-fqw5gTSEOGs3kAguR4tINFG7Xja1RAje+q67HJt2nGg=";
})
];
]
++
lib.optionals
(lib.versionAtLeast metadata.release_version "17" && lib.versionOlder metadata.release_version "19")
[
# Fixes test-suite on glibc 2.40 (https://github.com/llvm/llvm-project/pull/100804)
(fetchpatch2 {
url = "https://github.com/llvm/llvm-project/commit/1e8df9e85a1ff213e5868bd822877695f27504ad.patch";
hash = "sha256-EX+PYGicK73lsL/J0kSZ4S5y1/NHIclBddhsnV6NPPI=";
stripLen = 1;
})
];
pollyPatches =
[ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ]
++ lib.optional (lib.versionAtLeast metadata.release_version "15")

10857
pkgs/development/libraries/glibc/2.39-master.patch
View File

File diff suppressed because it is too large Load Diff

5127
pkgs/development/libraries/glibc/2.40-master.patch Normal file
View File

File diff suppressed because it is too large Load Diff

14
pkgs/development/libraries/glibc/common.nix
View File

@ -44,9 +44,9 @@
} @ args:
let
version = "2.39";
patchSuffix = "-52";
sha256 = "sha256-93vUfPgXDFc2Wue/hmlsEYrbOxINMlnGTFAtPcHi2SY=";
version = "2.40";
patchSuffix = "-36";
sha256 = "sha256-GaiQF16SY9dI9ieZPeb0sa+c0h4D8IDkv7Oh+sECBaI=";
in
assert withLinuxHeaders -> linuxHeaders != null;
@ -62,17 +62,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.39/master && git describe
glibc-2.39-52-gf8e4623421
$ git show --minimal --reverse glibc-2.39.. ':!ADVISORIES' > 2.39-master.patch
glibc-2.40-36-g7073164add
$ git show --minimal --reverse glibc-2.40.. ':!ADVISORIES' > 2.40-master.patch
To compare the archive contents zdiff can be used.
$ diff -u 2.39-master.patch ../nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch
$ diff -u 2.40-master.patch ../nixpkgs/pkgs/development/libraries/glibc/2.40-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.39-master.patch
./2.40-master.patch
/* Allow NixOS and Nix to handle the locale-archive. */
./nix-locale-archive.patch