gnumake42: fix build w/glibc-2.33

2021-05-28 11:19:46 +02:00 · 2021-05-28 11:19:46 +02:00 · 3f5336e15b
commit 3f5336e15b
parent acdcb8566a
2 changed files with 18 additions and 0 deletions
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@ -23,6 +23,7 @@ stdenv.mkDerivation {
    ./pselect.patch
    # Fix support for glibc 2.27's glob, inspired by http://www.linuxfromscratch.org/lfs/view/8.2/chapter05/make.html
    ./glibc-2.27-glob.patch
+    ./glibc-2.33-glob.patch
  ];

  nativeBuildInputs = lib.optionals guileSupport [ pkg-config ];
--- a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch
@ -0,0 +1,17 @@
+diff --git glob/glob.c glob/glob.c
+index 924f2b3..d4ef0c5 100644
+--- glob/glob.c
+++ glob/glob.c
+@@ -212,8 +212,8 @@ my_realloc (p, n)
+ # define __alloca	alloca
+ 
+ 
+-#ifndef __GNU_LIBRARY__
+ # define __stat stat
+#ifndef __GNU_LIBRARY__
+ # ifdef STAT_MACROS_BROKEN
+ #  undef S_ISDIR
+ # endif
+-- 
+2.31.1
+