diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-05-28 11:19:46 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-07-06 16:02:34 +0200 |
| commit | 3f5336e15bf72814ae5f8a3dd8a46a997c025ad6 (patch) | |
| tree | d4b69cb3d5ff75b195123ced4fb93569cca17dda /pkgs/development/tools/build-managers | |
| parent | acdcb8566ae560752a8a1ce3aacc617a3da6cdd5 (diff) | |
| download | nixpkgs-3f5336e15bf72814ae5f8a3dd8a46a997c025ad6.tar nixpkgs-3f5336e15bf72814ae5f8a3dd8a46a997c025ad6.tar.gz nixpkgs-3f5336e15bf72814ae5f8a3dd8a46a997c025ad6.tar.bz2 nixpkgs-3f5336e15bf72814ae5f8a3dd8a46a997c025ad6.tar.lz nixpkgs-3f5336e15bf72814ae5f8a3dd8a46a997c025ad6.tar.xz nixpkgs-3f5336e15bf72814ae5f8a3dd8a46a997c025ad6.tar.zst nixpkgs-3f5336e15bf72814ae5f8a3dd8a46a997c025ad6.zip | |
gnumake42: fix build w/glibc-2.33
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/gnumake/4.2/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 387650e85ab..69d9ba3d9ab 100644 --- 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 ]; diff --git 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 new file mode 100644 index 00000000000..d3e424d1c49 --- /dev/null +++ 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 + |