commit 494713367a2109844f155505a8000bc13cebd8e6 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Wed Oct 1 13:21:29 2014 +0200 make: removed obsolete patches diff --git a/make/make-3.82-bug_30612.patch b/make/make-3.82-bug_30612.patch deleted file mode 100644 index cdba1f4..0000000 --- a/make/make-3.82-bug_30612.patch +++ /dev/null @@ -1,70 +0,0 @@ -commit 2a59dc32aaf0681dec569f32a9d7ab88a379d34f -Author: psmith <psmith> -Date: Sat Aug 14 02:50:14 2010 +0000 - - - Fix the NEWS file to be accurate - - Add oneshell to $(.FEATURES) (forgot that!) - - Fix Savannah bug #30612: handling of archive references with >1 object - -diff --git a/main.c b/main.c -index 9fe8090..782b0de 100644 ---- a/main.c -+++ b/main.c -@@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp) - a macro and some compilers (MSVC) don't like conditionals in macros. */ - { - const char *features = "target-specific order-only second-expansion" -- " else-if shortest-stem undefine" -+ " else-if shortest-stem undefine oneshell" - #ifndef NO_ARCHIVES - " archives" - #endif -diff --git a/read.c b/read.c -index a3ad88e..9dfd4ea 100644 ---- a/read.c -+++ b/read.c -@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, - { - /* This looks like the first element in an open archive group. - A valid group MUST have ')' as the last character. */ -- const char *e = p + nlen; -+ const char *e = p; - do - { - e = next_token (e); -@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, - Go to the next item in the string. */ - if (flags & PARSEFS_NOGLOB) - { -- NEWELT (concat (2, prefix, tp)); -+ NEWELT (concat (2, prefix, tmpbuf)); - continue; - } - - /* If we get here we know we're doing glob expansion. - TP is a string in tmpbuf. NLEN is no longer used. - We may need to do more work: after this NAME will be set. */ -- name = tp; -+ name = tmpbuf; - - /* Expand tilde if applicable. */ -- if (tp[0] == '~') -+ if (tmpbuf[0] == '~') - { -- tildep = tilde_expand (tp); -+ tildep = tilde_expand (tmpbuf); - if (tildep != 0) - name = tildep; - } -@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, - else - { - /* We got a chain of items. Attach them. */ -- (*newp)->next = found; -+ if (*newp) -+ (*newp)->next = found; -+ else -+ *newp = found; - - /* Find and set the new end. Massage names if necessary. */ - while (1) diff --git a/make/make-3.82-bug_30653.patch b/make/make-3.82-bug_30653.patch deleted file mode 100644 index fbe2f77..0000000 --- a/make/make-3.82-bug_30653.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit d1ba0ee36b2bdd91434b5df90f0f4cceda7d6979 -Author: psmith <psmith> -Date: Mon Sep 10 02:36:05 2012 +0000 - - Force intermediate targets to be considered if their non-intermediate - parent needs to be remade. Fixes Savannah bug #30653. - -diff --git a/remake.c b/remake.c -index c0bf709..b1ddd23 100644 ---- a/remake.c -+++ b/remake.c -@@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth) - d->file->dontcare = file->dontcare; - } - -+ /* We may have already considered this file, when we didn't know -+ we'd need to update it. Force update_file() to consider it and -+ not prune it. */ -+ d->file->considered = !considered; - - dep_status |= update_file (d->file, depth); - diff --git a/make/make-3.82-bug_30723.patch b/make/make-3.82-bug_30723.patch deleted file mode 100644 index dfb0660..0000000 --- a/make/make-3.82-bug_30723.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit a6f280559f34dc805381507e59c9189b7149b853 -Author: psmith <psmith> -Date: Tue Aug 10 07:35:34 2010 +0000 - - Fix Savannah bug #30723: expand MAKEFLAGS before we re-exec after - rebuilding makefiles. - -diff --git a/main.c b/main.c -index c6989e3..9fe8090 100644 ---- a/main.c -+++ b/main.c -@@ -2093,7 +2093,7 @@ main (int argc, char **argv, char **envp) - const char *pv = define_makeflags (1, 1); - char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); - sprintf (p, "MAKEFLAGS=%s", pv); -- putenv (p); -+ putenv (allocated_variable_expand (p)); - } - - if (ISDB (DB_BASIC))