pool/make
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 539476 from home:Andreas_Schwab:Factory

Browse Source 
- glob-lstat.patch: Do not assume glibc glob internals

OBS-URL: https://build.opensuse.org/request/show/539476
OBS-URL: https://build.opensuse.org/package/show/Base:System/make?expand=0&rev=57
This commit is contained in:
Andreas Schwab 2017-11-07 10:03:35 +00:00 committed by Git OBS Bridge
parent 54a17f44a5
commit 89741dae72
3 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
glob-lstat.patch Normal file
View File

@ -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: [PATCH] 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 adbb8a9b99..c343e4c29c 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
--
2.15.0

5
make.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 6 08:52:40 UTC 2017 - schwab@suse.de
- glob-lstat.patch: Do not assume glibc glob internals
-------------------------------------------------------------------
Wed Oct 18 09:09:44 UTC 2017 - bwiedemann@suse.com

4
make.spec
View File

@ -28,8 +28,9 @@ Source1: http://ftp.gnu.org/gnu/make/make-%{version}.tar.bz2.sig
# keyring downloaded from http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=make
Source2: %{name}.keyring
Patch1: make-testcases_timeout.diff
# FEATURE-OPENSUSE sort glob https://savannah.gnu.org/bugs/index.php?52076
# PATCH-FEATURE-OPENSUSE sort glob https://savannah.gnu.org/bugs/index.php?52076
Patch2: make-sorted-glob.patch
Patch3: glob-lstat.patch
Patch64: make-library-search-path.diff
Requires(post): %{install_info_prereq}
Requires(preun): %{install_info_prereq}
@ -46,6 +47,7 @@ The GNU make command with extensive documentation.
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
if [ %{_lib} == lib64 ]; then
%patch64 -p1
fi