Skip to content
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

Jump to bottom

glibc: allow (cross)-build on case-insensitive fs #303868

Merged
merged 1 commit into from
Apr 14, 2024
Merged

glibc: allow (cross)-build on case-insensitive fs #303868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 8 deletions pkgs/development/libraries/glibc/2.39-master.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion pkgs/development/libraries/glibc/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,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

Expand Down