diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2024-04-14 08:09:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-14 08:09:23 +0000 |
| commit | dd8e61da4aadb1288e9db2ded077bb74628c28ac (patch) | |
| tree | 499b2c5ae42fe14a5363b3fd7758ad6e7ddf808c /pkgs/development/libraries/glibc | |
| parent | cd4f4bd4899dd6fcb04d4fa4be3892203810e11c (diff) | |
| parent | 0897e8b6db11e65547758d1fd04fc5766cb2fe7a (diff) | |
Merge pull request #303868 from Ma27/glibc-case-insensitive-fs-build
glibc: allow (cross)-build on case-insensitive fs
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/2.39-master.patch | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/development/libraries/glibc/2.39-master.patch b/pkgs/development/libraries/glibc/2.39-master.patch index 3e0815573f5eb..e4e3dcbba46ca 100644 --- a/pkgs/development/libraries/glibc/2.39-master.patch +++ b/pkgs/development/libraries/glibc/2.39-master.patch @@ -6,14 +6,6 @@ Date: Wed Jan 31 02:12:43 2024 +0100 Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> -diff --git a/ADVISORIES b/ADVISORIES -new file mode 100644 -index 0000000000..d4e33f2df3 ---- /dev/null -+++ b/ADVISORIES -@@ -0,0 +1,2 @@ -+For the GNU C Library Security Advisories, see the git master branch: -+https://sourceware.org/git/?p=glibc.git;a=tree;f=advisories;hb=HEAD diff --git a/advisories/GLIBC-SA-2023-0001 b/advisories/GLIBC-SA-2023-0001 deleted file mode 100644 index 3d19c91b6a..0000000000 diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index c2776a157764d..f9d9513b85d83 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -61,10 +61,14 @@ 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-5-ge0910f1d32 - $ git show --minimal --reverse glibc-2.39.. > 2.39-master.patch + $ git show --minimal --reverse glibc-2.39.. ':!ADVISORIES' > 2.39-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 + + 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 |