From: Marius Bakke <mbakke@fastmail.com>
To: 30873@debbugs.gnu.org
Subject: [bug#30873] [PATCH core-updates 2/3] gnu: make: Fix compatibility with glibc 2.27.
Date: Tue, 20 Mar 2018 11:24:18 +0100 [thread overview]
Message-ID: <20180320102419.32286-2-mbakke@fastmail.com> (raw)
In-Reply-To: <20180320102419.32286-1-mbakke@fastmail.com>
* gnu/packages/patches/make-glibc-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/base.scm (gnu-make)[source](patches): Use it.
---
gnu/local.mk | 1 +
gnu/packages/base.scm | 8 +++--
gnu/packages/patches/make-glibc-compat.patch | 52 ++++++++++++++++++++++++++++
3 files changed, 59 insertions(+), 2 deletions(-)
create mode 100644 gnu/packages/patches/make-glibc-compat.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 2b2684a20..0055192a7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -893,6 +893,7 @@ dist_patch_DATA = \
%D%/packages/patches/lvm2-static-link.patch \
%D%/packages/patches/lxsession-use-gapplication.patch \
%D%/packages/patches/mailutils-uninitialized-memory.patch \
+ %D%/packages/patches/make-glibc-compat.patch \
%D%/packages/patches/make-impure-dirs.patch \
%D%/packages/patches/mars-install.patch \
%D%/packages/patches/mars-sfml-2.3.patch \
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 57c7cd514..a1aca3ae6 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -386,13 +386,17 @@ functionality beyond that which is outlined in the POSIX standard.")
(sha256
(base32
"12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"))
- (patches (search-patches "make-impure-dirs.patch"))))
+ (patches (search-patches "make-impure-dirs.patch"
+ "make-glibc-compat.patch"))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config))) ; to detect Guile
(inputs `(("guile" ,guile-2.0)))
(outputs '("out" "debug"))
(arguments
- '(#:phases
+ '(;; Work around faulty glob detection with glibc 2.27. See
+ ;; <https://lists.nongnu.org/archive/html/bug-make/2017-11/msg00027.html>.
+ #:configure-flags '("make_cv_sys_gnu_glob=yes")
+ #:phases
(modify-phases %standard-phases
(add-before 'build 'set-default-shell
(lambda* (#:key inputs #:allow-other-keys)
diff --git a/gnu/packages/patches/make-glibc-compat.patch b/gnu/packages/patches/make-glibc-compat.patch
new file mode 100644
index 000000000..9ce7f2b5b
--- /dev/null
+++ b/gnu/packages/patches/make-glibc-compat.patch
@@ -0,0 +1,52 @@
+Work with the new glob interface in glibc 2.27.
+
+Taken from this upstream commit:
+https://git.savannah.gnu.org/cgit/make.git/commit/?id=193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4
+
+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
--
2.16.2
next prev parent reply other threads:[~2018-03-20 10:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-20 10:20 [bug#30873] [PATCH core-updates 0/3] glibc 2.27 Marius Bakke
2018-03-20 10:24 ` [bug#30873] [PATCH core-updates 1/3] gnu: glibc: Update to 2.27 Marius Bakke
2018-03-20 10:24 ` Marius Bakke [this message]
2018-03-20 13:19 ` [bug#30873] [PATCH core-updates 2/3] gnu: make: Fix compatibility with glibc 2.27 Ludovic Courtès
2018-03-20 10:24 ` [bug#30873] [PATCH core-updates 3/3] gnu: make: End phase on #t Marius Bakke
2018-03-20 13:19 ` Ludovic Courtès
2018-03-20 13:18 ` [bug#30873] [PATCH core-updates 1/3] gnu: glibc: Update to 2.27 Ludovic Courtès
2018-03-20 16:54 ` Marius Bakke
2018-03-21 18:26 ` Ludovic Courtès
2018-03-22 18:36 ` bug#30873: " Marius Bakke
2018-03-23 9:20 ` [bug#30873] " Ludovic Courtès
2018-03-22 12:53 ` [bug#30873] glibc-2.27 patches Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180320102419.32286-2-mbakke@fastmail.com \
--to=mbakke@fastmail.com \
--cc=30873@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.