diff options
| author | taca <taca@pkgsrc.org> | 2010-08-31 07:02:48 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2010-08-31 07:02:48 +0000 |
| commit | e3d1c2392d6b8c9b84ffab35b7bdceb21ce71ee6 (patch) | |
| tree | d4ae4cd5eba12cb2f8d97e96a435431d4609d60a /devel/gmake | |
| parent | 736430da808256eec81044e24d20d28938a91c67 (diff) | |
| download | pkgsrc-e3d1c2392d6b8c9b84ffab35b7bdceb21ce71ee6.tar.gz | |
Add a fix for bug #30612 (http://savannah.gnu.org/bugs/index.php?30612)
from GNU make's CVS repository (revision 1.194). It solves some of
strange compile error on misc/rpm (and maybe more).
Bump PKGREVISION.
Diffstat (limited to 'devel/gmake')
| -rw-r--r-- | devel/gmake/Makefile | 3 | ||||
| -rw-r--r-- | devel/gmake/patches/patch-ah | 52 |
2 files changed, 54 insertions, 1 deletions
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 26c3723f33f..43a7547af2b 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.73 2010/08/07 06:33:18 wiz Exp $ +# $NetBSD: Makefile,v 1.74 2010/08/31 07:02:48 taca Exp $ DISTNAME= make-3.82 PKGNAME= g${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=make/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/gmake/patches/patch-ah b/devel/gmake/patches/patch-ah new file mode 100644 index 00000000000..e7c8e30a24f --- /dev/null +++ b/devel/gmake/patches/patch-ah @@ -0,0 +1,52 @@ +$NetBSD: patch-ah,v 1.1 2010/08/31 07:02:48 taca Exp $ + +Add a fix for bug #30612 (http://savannah.gnu.org/bugs/index.php?30612) +from GNU make's CVS repository (revision 1.194). + +--- read.c.orig 2010-07-13 01:20:42.000000000 +0000 ++++ read.c +@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned + { + /* 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 + 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 + 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) |