Commit 72cb02d0 authored by Helmut Grohne's avatar Helmut Grohne

drop FTBFS patch #891365 applied in make-dfsg/4.2.1-1.1

parent f0a78d92
......@@ -3531,94 +3531,7 @@ buildenv_libxt() {
add_automatic libzstd
add_automatic lz4
add_automatic make-dfsg
patch_make_dfsg() {
echo "fixing FTBFS with glibc 2.27 #891365"
drop_privs patch -p1 <<'EOF'
commit 48c8a116a914a325a0497721f5d8b58d5bba34d4
Author: Paul Smith <psmith@gnu.org>
Date: Sun Nov 19 15:09:16 2017 -0500
* configure.ac: Support GLIBC glob interface version 2
commit 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun Sep 24 09:12:58 2017 -0400
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.
--- a/configure.ac
+++ b/configure.ac
@@ -404,10 +404,9 @@
#include <glob.h>
#include <fnmatch.h>
-#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 == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
gnu glob
# endif
#endif],
--- a/dir.c
+++ b/dir.c
@@ -1299,15 +1299,40 @@
}
#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
EOF
}
add_automatic man-db
add_automatic mawk
add_automatic mpclib3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment