Merge pull request #44838 from Infinisil/fix/remake

remake: fix build with glibc2.27
This commit is contained in:
Silvan Mosberger 2018-08-09 23:20:27 +02:00 committed by GitHub
commit faf2821566
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 0 deletions

View File

@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "1zi16pl7sqn1aa8b7zqm9qnd9vjqyfywqm8s6iap4clf86l7kss2";
};
patches = [
./glibc-2.27-glob.patch
];
buildInputs = [ readline ];
meta = {

View File

@ -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 <alloca.h>
-# else /* Not HAVE_ALLOCA_H. */
-# ifndef _AIX
-# ifdef WINDOWS32
-# include <malloc.h>
-# 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