From 74d7f702b16a76a75d65ef3bb37fc80f23ee4c79 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Sat, 22 Sep 2018 07:35:07 -0300
Subject: [PATCH] make: fix build with glibc >= 2.28

---
 srcpkgs/make/patches/fix-glibc-2.28.patch | 96 +++++++++++++++++++++++
 srcpkgs/make/template                     | 12 ++-
 2 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/make/patches/fix-glibc-2.28.patch

diff --git a/srcpkgs/make/patches/fix-glibc-2.28.patch b/srcpkgs/make/patches/fix-glibc-2.28.patch
new file mode 100644
index 00000000000..62ecf66d7b5
--- /dev/null
+++ b/srcpkgs/make/patches/fix-glibc-2.28.patch
@@ -0,0 +1,96 @@
+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
+
+From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith@gnu.org>
+Date: Sun, 19 Nov 2017 15:09:16 -0500
+Subject: * configure.ac: Support GLIBC glob interface version 2
+
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8c72568..4710832 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob],
+ #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],
+-- 
+cgit v1.0-41-gc330
+
+
diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 5f4bc9e2b19..80ad1bb3a6c 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,7 +1,8 @@
-# Template build file for 'make'
+# Template file for 'make'
 pkgname=make
 version=4.2.1
 revision=3
+patch_args="-Np1"
 bootstrap=yes
 build_style=gnu-configure
 build_options=guile
@@ -10,8 +11,13 @@ hostmakedepends="$(vopt_if guile pkg-config)"
 makedepends="$(vopt_if guile 'gc-devel guile-devel')"
 short_desc="The GNU make system"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-homepage="http://www.gnu.org/software/make"
 license="GPL-3"
-distfiles="${GNU_SITE}/make/$pkgname-$version.tar.bz2"
+homepage="http://www.gnu.org/software/make"
+distfiles="${GNU_SITE}/make/${pkgname}-${version}.tar.bz2"
 checksum=d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589
 
+# This should be temporary until upstream releases a new version with fixes
+hostmakedepends+=" automake gettext-devel pkg-config"
+pre_configure() {
+	autoreconf -fi
+}