dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

gnumake42: fix build w/glibc-2.33

Browse Source
This commit is contained in:
Maximilian Bosch 2021-05-28 11:19:46 +02:00 committed by Vladimír Čunát
parent acdcb8566a
commit 3f5336e15b
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/tools/build-managers/gnumake/4.2/default.nix
View File

@ -23,6 +23,7 @@ stdenv.mkDerivation {
./pselect.patch ./pselect.patch
# Fix support for glibc 2.27's glob, inspired by http://www.linuxfromscratch.org/lfs/view/8.2/chapter05/make.html # 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.27-glob.patch
./glibc-2.33-glob.patch
]; ];
nativeBuildInputs = lib.optionals guileSupport [ pkg-config ]; nativeBuildInputs = lib.optionals guileSupport [ pkg-config ];

17
pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch Normal file
View File

@ -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