From 3f5336e15bf72814ae5f8a3dd8a46a997c025ad6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 May 2021 11:19:46 +0200 Subject: [PATCH] gnumake42: fix build w/glibc-2.33 --- .../build-managers/gnumake/4.2/default.nix | 1 + .../gnumake/4.2/glibc-2.33-glob.patch | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch 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 387650e85ab7..69d9ba3d9abc 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 000000000000..d3e424d1c499 --- /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 +