[Gsrc-commit] trunk r6505: make 4.2.1 important patch

[Carl Hansen]

------------------------------------------------------------
revno: 6505
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Mon 2019-05-06 13:58:42 -0700
message:
  make 4.2.1 important patch
added:
  pkg/gnu/make/files/            files-20190506205733-qmbsn44k3mmuqaid-1
  pkg/gnu/make/files/make4.21.patch 
make4.21.patch-20190506205733-qmbsn44k3mmuqaid-2
modified:
  pkg/gnu/make/Makefile          makefile-20160617014725-uokjfnggs70iry9h-1315
  pkg/gnu/make/gpg-keyring       gpgkeyring-20160617014725-uokjfnggs70iry9h-1319
  pkg/gnu/make/sha256sums        sha256sums-20160617014725-uokjfnggs70iry9h-1320

=== modified file 'pkg/gnu/make/Makefile'
--- a/pkg/gnu/make/Makefile     2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/make/Makefile     2019-05-06 20:58:42 +0000
@@ -1,6 +1,7 @@
 # Copyright © 2013, 2014, 2016 Brandon Invergo <address@hidden>
 #
-# This file is part of GSRC.
+# This file is part of GSRC, the GNU Source Release Collection.
+# http://www.gnu.org/software/gsrc
 #
 # GSRC is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -14,10 +15,12 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GSRC.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Send bug reports and comments about GSRC problems to address@hidden
 
 NAME = Make
 GARNAME = make
-#GARVERSION = 4.1  , previous version, if that's what you want
 GARVERSION = 4.2.1
 HOME_URL = http://www.gnu.org/software/make/
 DESCRIPTION = Remake files automatically
@@ -33,6 +36,11 @@
 
 ######################################################################
 
+# patch file for alloca bug
+# now build correctly. 2019
+PATCHFILES = make4.21.patch
+PATCHOPTS = -p1
+
 MASTER_SITES = $(MASTER_GNU)
 MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.bz2
@@ -46,3 +54,11 @@
 include ../../../gar/gar.lib/auto.mk
 include ../../../gar/gar.lib/info.mk
 include config.mk
+
+post-patch: 
+       touch $(WORKSRC)/aclocal.m4
+       touch $(WORKSRC)/Makefile.in
+       touch $(WORKSRC)/configure
+
+
+

=== added directory 'pkg/gnu/make/files'
=== added file 'pkg/gnu/make/files/make4.21.patch'
--- a/pkg/gnu/make/files/make4.21.patch 1970-01-01 00:00:00 +0000
+++ b/pkg/gnu/make/files/make4.21.patch 2019-05-06 20:58:42 +0000
@@ -0,0 +1,123 @@
+Apply this patch to the results of unpacking a make 4.2.1 tarball,
+then run the following commands:
+
+    touch aclocal.m4
+    touch Makefile.in
+    touch configure
+
+Now you should be able to reconfigure and rebuild.
+
+
+
+--- a/configure.ac     2016-06-06 08:27:31.000000000 -0400
++++ b/configure.ac     2019-05-04 14:24:17.102496612 -0400
+@@ -399,10 +399,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    2016-05-31 03:17:26.000000000 -0400
++++ b/dir.c    2019-05-04 14:24:11.134431911 -0400
+@@ -407,6 +407,7 @@
+     const char *name;           /* Name of the file.  */
+     size_t length;
+     short impossible;           /* This file is impossible.  */
++    unsigned char type;
+   };
+ 
+ static unsigned long
+@@ -731,6 +732,9 @@
+ #else
+           df->name = strcache_add_len (d->d_name, len);
+ #endif
++#ifdef _DIRENT_HAVE_D_TYPE
++          df->type = d->d_type;
++#endif
+           df->length = len;
+           df->impossible = 0;
+           hash_insert_at (&dir->dirfiles, df, dirfile_slot);
+@@ -1242,7 +1246,7 @@
+           d->d_namlen = len - 1;
+ #endif
+ #ifdef _DIRENT_HAVE_D_TYPE
+-          d->d_type = DT_UNKNOWN;
++          d->d_type = df->type;
+ #endif
+           memcpy (d->d_name, df->name, len);
+           return d;
+@@ -1299,15 +1303,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
+--- a/tests/run_make_tests.pl
++++ b/tests/run_make_tests.pl
+@@ -58,6 +58,9 @@ if ($^O eq 'VMS')
+   *CORE::GLOBAL::rmdir = \&vms_rmdir;
+ }
+ 
++use FindBin;
++use lib "$FindBin::Bin";
++
+ require "test_driver.pl";
+ require "config-flags.pm";
+ 
+--- a/configure        2016-06-10 19:03:21.000000000 -0400
++++ b/configure        2019-05-04 14:33:03.212667798 -0400
+@@ -11481,10 +11481,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

=== modified file 'pkg/gnu/make/gpg-keyring'
Binary files a/pkg/gnu/make/gpg-keyring 2016-06-17 19:08:15 +0000 and 
b/pkg/gnu/make/gpg-keyring        2019-05-06 20:58:42 +0000 differ
=== modified file 'pkg/gnu/make/sha256sums'
--- a/pkg/gnu/make/sha256sums   2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/make/sha256sums   2019-05-06 20:58:42 +0000
@@ -1,2 +1,3 @@
 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589  
download/make-4.2.1.tar.bz2
+c3edd087313f377a96c69b42384a236f4fac9392a2dd818423d96f992955bfbf  
download/make4.21.patch
 477291e48cffea35e8048956b2fcde35a8169017b65b710f4f58fa776cff270a  
download/make-4.2.1.tar.bz2.sig