mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
glibc: allow (cross)-build on case-insensitive fs
...such as APFS. The problem here is that a change inside the 2.39 patchset creates a file `ADVISORIES` and also contains a directory `advisories/` and both are considered the same file on APFS. Reproducible with `nix-build -A pkgsCross.gnu64.stdenv.cc` on a `aarch64-darwin` host. Hence, excluding the file from the patchset as it is non-functional anyways. Closes #303193
This commit is contained in:
parent
ce4ab12bfc
commit
0897e8b6db
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user