summaryrefslogtreecommitdiffstats
path: root/abs/core/make/bug30612.patch
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-08-07 17:35:30 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-08-07 17:35:30 (GMT)
commit4fe0a91dc41e4f497a8aa5497c21799060d5fddd (patch)
tree0f5c663035712d7b6441f4c93335d9bc22cc5029 /abs/core/make/bug30612.patch
parentd09de6629ad05b3ad935ac79e7ed6c7fe46e3cf2 (diff)
downloadlinhes_pkgbuild-4fe0a91dc41e4f497a8aa5497c21799060d5fddd.zip
linhes_pkgbuild-4fe0a91dc41e4f497a8aa5497c21799060d5fddd.tar.gz
linhes_pkgbuild-4fe0a91dc41e4f497a8aa5497c21799060d5fddd.tar.bz2
make 3.82
-moved to core
Diffstat (limited to 'abs/core/make/bug30612.patch')
-rw-r--r--abs/core/make/bug30612.patch66
1 files changed, 66 insertions, 0 deletions
diff --git a/abs/core/make/bug30612.patch b/abs/core/make/bug30612.patch
new file mode 100644
index 0000000..fb843bc
--- /dev/null
+++ b/abs/core/make/bug30612.patch
@@ -0,0 +1,66 @@
+diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c
+--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000
++++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000
+@@ -1,3 +1,4 @@
++
+ /* Argument parsing and main program of GNU Make.
+ Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+@@ -1138,7 +1139,7 @@
+ 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 -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c
+--- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000
++++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000
+@@ -3028,7 +3028,7 @@
+ {
+ /* 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 @@
+ 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,11 @@
+ 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)