make: Fix SEGV with glibc >= 2.26
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
parent
b63b4814fd
commit
5d1e95eb4a
12
make/make.nm
12
make/make.nm
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
name = make
|
name = make
|
||||||
version = 4.2.1
|
version = 4.2.1
|
||||||
release = 1
|
release = 2
|
||||||
|
|
||||||
maintainer = Michael Tremer <michael.tremer@ipfire.org>
|
maintainer = Michael Tremer <michael.tremer@ipfire.org>
|
||||||
groups = Development/Tools
|
groups = Development/Tools
|
||||||
|
@ -25,6 +25,16 @@ end
|
||||||
source_dl = http://ftp.gnu.org/gnu/make/
|
source_dl = http://ftp.gnu.org/gnu/make/
|
||||||
|
|
||||||
build
|
build
|
||||||
|
requires
|
||||||
|
autoconf
|
||||||
|
automake
|
||||||
|
gettext-devel
|
||||||
|
end
|
||||||
|
|
||||||
|
prepare_cmds
|
||||||
|
autoreconf -vfi
|
||||||
|
end
|
||||||
|
|
||||||
test
|
test
|
||||||
make check
|
make check
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,67 @@
|
||||||
|
From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||||
|
Date: Sun, 24 Sep 2017 09:12:58 -0400
|
||||||
|
Subject: glob: Do not assume glibc glob internals.
|
||||||
|
|
||||||
|
It has been proposed that glibc glob start using gl_lstat,
|
||||||
|
which the API allows it to do. GNU 'make' should not get in
|
||||||
|
the way of this. See:
|
||||||
|
https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
|
||||||
|
|
||||||
|
* dir.c (local_lstat): New function, like local_stat.
|
||||||
|
(dir_setup_glob): Use it to initialize gl_lstat too, as the API
|
||||||
|
requires.
|
||||||
|
---
|
||||||
|
dir.c | 29 +++++++++++++++++++++++++++--
|
||||||
|
1 file changed, 27 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/dir.c b/dir.c
|
||||||
|
index adbb8a9..c343e4c 100644
|
||||||
|
--- a/dir.c
|
||||||
|
+++ b/dir.c
|
||||||
|
@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+/* Similarly for lstat. */
|
||||||
|
+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
|
||||||
|
+# ifndef VMS
|
||||||
|
+# ifndef HAVE_SYS_STAT_H
|
||||||
|
+int lstat (const char *path, struct stat *sbuf);
|
||||||
|
+# endif
|
||||||
|
+# else
|
||||||
|
+ /* We are done with the fake lstat. Go back to the real lstat */
|
||||||
|
+# ifdef lstat
|
||||||
|
+# undef lstat
|
||||||
|
+# endif
|
||||||
|
+# endif
|
||||||
|
+# define local_lstat lstat
|
||||||
|
+#elif defined(WINDOWS32)
|
||||||
|
+/* Windows doesn't support lstat(). */
|
||||||
|
+# define local_lstat local_stat
|
||||||
|
+#else
|
||||||
|
+static int
|
||||||
|
+local_lstat (const char *path, struct stat *buf)
|
||||||
|
+{
|
||||||
|
+ int e;
|
||||||
|
+ EINTRLOOP (e, lstat (path, buf));
|
||||||
|
+ return e;
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
void
|
||||||
|
dir_setup_glob (glob_t *gl)
|
||||||
|
{
|
||||||
|
gl->gl_opendir = open_dirstream;
|
||||||
|
gl->gl_readdir = read_dirstream;
|
||||||
|
gl->gl_closedir = free;
|
||||||
|
+ gl->gl_lstat = local_lstat;
|
||||||
|
gl->gl_stat = local_stat;
|
||||||
|
- /* We don't bother setting gl_lstat, since glob never calls it.
|
||||||
|
- The slot is only there for compatibility with 4.4 BSD. */
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
--
|
||||||
|
cgit v1.0-41-gc330
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- make-4.2.1/configure.ac~ 2018-02-08 12:31:17.105922978 +0000
|
||||||
|
+++ make-4.2.1/configure.ac 2018-02-08 12:31:35.249509647 +0000
|
||||||
|
@@ -402,7 +402,7 @@ AC_CACHE_CHECK([if system libc has GNU g
|
||||||
|
#define GLOB_INTERFACE_VERSION 1
|
||||||
|
#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
|
||||||
|
# include <gnu-versions.h>
|
||||||
|
-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
|
||||||
|
+# if _GNU_GLOB_INTERFACE_VERSION >= GLOB_INTERFACE_VERSION
|
||||||
|
gnu glob
|
||||||
|
# endif
|
||||||
|
#endif],
|
Loading…
Reference in New Issue