From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 22 Sep 2017 17:43:57 +0000 (+0100)
Subject: make: Update to 4.2.1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c9ce6ca2b207bf98dc8571ef0677c7bdb0ca636;p=ipfire-3.x.git

make: Update to 4.2.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/make/make.nm b/make/make.nm
index 358904269..84a60f845 100644
--- a/make/make.nm
+++ b/make/make.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = make
-version    = 4.1
+version    = 4.2.1
 release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -23,11 +23,9 @@ description
 end
 
 source_dl  = http://ftp.gnu.org/gnu/make/
-sources    = %{thisapp}.tar.bz2
 
 build
 	test
-		sed -e "s/-w/& /" -i tests/scripts/features/recursion
 		make check
 	end
 end
diff --git a/make/patches/make-4.0-getcwd.patch b/make/patches/make-4.0-getcwd.patch
deleted file mode 100644
index c0bb45960..000000000
--- a/make/patches/make-4.0-getcwd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrup a/makeint.h b/makeint.h
---- a/makeint.h	2013-10-09 00:22:40.000000000 -0400
-+++ b/makeint.h	2014-02-03 17:46:24.969618708 -0500
-@@ -528,7 +528,7 @@ long int lseek ();
- #endif  /* Not GNU C library or POSIX.  */
- 
- #ifdef  HAVE_GETCWD
--# if !defined(VMS) && !defined(__DECC)
-+# if !defined(VMS) && !defined(__DECC) && !defined(getcwd)
- char *getcwd ();
- # endif
- #else
diff --git a/make/patches/make-4.0-newlines.patch b/make/patches/make-4.0-newlines.patch
deleted file mode 100644
index add32c55e..000000000
--- a/make/patches/make-4.0-newlines.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nrup a/job.c b/job.c
---- a/job.c	2014-02-03 18:23:45.936436714 -0500
-+++ b/job.c	2014-02-04 00:17:53.232074893 -0500
-@@ -3269,13 +3269,14 @@ construct_command_argv_internal (char *l
- #endif
-             if (PRESERVE_BSNL)
-               {
--                *(ap++) = '\\';
-+                *(ap++) = '\'';
-                 /* Only non-batch execution needs another backslash,
-                    because it will be passed through a recursive
-                    invocation of this function.  */
-                 if (!batch_mode_shell)
-                   *(ap++) = '\\';
-                 *(ap++) = '\n';
-+                *(ap++) = '\'';
-               }
-             ++p;
-             continue;
diff --git a/make/patches/make-4.0-noclock_gettime.patch b/make/patches/make-4.0-noclock_gettime.patch
deleted file mode 100644
index f63e1fc7c..000000000
--- a/make/patches/make-4.0-noclock_gettime.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up make-3.82/configure\~ make-3.82/configure
---- make-3.82/configure~	2010-07-28 07:41:51.000000000 +0200
-+++ make-3.82/configure	2010-08-11 15:07:50.000000000 +0200
-@@ -7215,7 +7215,7 @@ return clock_gettime ();
-   return 0;
- }
- _ACEOF
--for ac_lib in '' rt posix4; do
-+for ac_lib in '' posix4; do
-   if test -z "$ac_lib"; then
-     ac_res="none required"
-   else
-
-Diff finished.  Wed Aug 11 15:07:59 2010
diff --git a/make/patches/make-4.0-weird-shell.patch b/make/patches/make-4.0-weird-shell.patch
deleted file mode 100644
index dfdaf89c9..000000000
--- a/make/patches/make-4.0-weird-shell.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up make-3.82/job.c\~ make-3.82/job.c
---- make-3.82/job.c~	2010-08-11 16:13:33.000000000 +0200
-+++ make-3.82/job.c	2010-08-12 14:20:08.000000000 +0200
-@@ -2442,7 +2442,11 @@ construct_command_argv_internal (char *l
- 
-   /* See if it is safe to parse commands internally.  */
-   if (shell == 0)
--    shell = default_shell;
-+    {
-+      shell = default_shell;
-+      if (shellflags == 0)
-+	shellflags = "-c";
-+    }
- #ifdef WINDOWS32
-   else if (strcmp (shell, default_shell))
-   {