From 258312352317f73e2f9f08dd9a94f9e1216e7455 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 9 Aug 2018 22:23:04 +0200 Subject: [PATCH] remake: fix build with glibc2.27 Same fix as applied for gnumake in 519f0b8db2f91e73964375ee81fc411153bf3aa3 --- .../tools/build-managers/remake/default.nix | 4 +++ .../remake/glibc-2.27-glob.patch | 34 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 926cc83cd976..3eca6f02e45d 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1zi16pl7sqn1aa8b7zqm9qnd9vjqyfywqm8s6iap4clf86l7kss2"; }; + patches = [ + ./glibc-2.27-glob.patch + ]; + buildInputs = [ readline ]; meta = { diff --git a/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch b/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch new file mode 100644 index 000000000000..ef876e2fb237 --- /dev/null +++ b/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch @@ -0,0 +1,34 @@ +diff --git a/glob/glob.c b/glob/glob.c +index f3911bcd861..6cb76e8e162 100644 +--- a/glob/glob.c ++++ b/glob/glob.c +@@ -208,29 +208,8 @@ my_realloc (p, n) + #endif /* __GNU_LIBRARY__ || __DJGPP__ */ + + +-#if !defined __alloca && !defined __GNU_LIBRARY__ +- +-# ifdef __GNUC__ +-# undef alloca +-# define alloca(n) __builtin_alloca (n) +-# else /* Not GCC. */ +-# ifdef HAVE_ALLOCA_H +-# include +-# else /* Not HAVE_ALLOCA_H. */ +-# ifndef _AIX +-# ifdef WINDOWS32 +-# include +-# else +-extern char *alloca (); +-# endif /* WINDOWS32 */ +-# endif /* Not _AIX. */ +-# endif /* sparc or HAVE_ALLOCA_H. */ +-# endif /* GCC. */ +- + # define __alloca alloca + +-#endif +- + #ifndef __GNU_LIBRARY__ + # define __stat stat + # ifdef STAT_MACROS_BROKEN