diff options
| author | dholland <dholland@pkgsrc.org> | 2015-06-13 00:10:12 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2015-06-13 00:10:12 +0000 |
| commit | ee72dfa8a1246a51b2cfae933766deec5ef55f1e (patch) | |
| tree | d2765cd7229e6448ce9605407e3a41f44ef60f27 /devel | |
| parent | a7cda165f10401b027980868cf401024a95ddc9d (diff) | |
| download | pkgsrc-ee72dfa8a1246a51b2cfae933766deec5ef55f1e.tar.gz | |
Work around build failure with gcc 4.1.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/tradcpp/distinfo | 3 | ||||
| -rw-r--r-- | devel/tradcpp/patches/patch-macro.c | 38 |
2 files changed, 40 insertions, 1 deletions
diff --git a/devel/tradcpp/distinfo b/devel/tradcpp/distinfo index 96655b26679..086099406ea 100644 --- a/devel/tradcpp/distinfo +++ b/devel/tradcpp/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.9 2015/06/12 08:23:51 dholland Exp $ +$NetBSD: distinfo,v 1.10 2015/06/13 00:10:12 dholland Exp $ SHA1 (tradcpp-0.5.tar.gz) = e153eabe2d01627d640cf36386941e5b1d549f21 RMD160 (tradcpp-0.5.tar.gz) = 38fa87d6c297d1e02fbc4c1d4a4ddbae6046234e Size (tradcpp-0.5.tar.gz) = 36701 bytes +SHA1 (patch-macro.c) = 7bc02b70f7b5f52581747e997874e75531c00026 diff --git a/devel/tradcpp/patches/patch-macro.c b/devel/tradcpp/patches/patch-macro.c new file mode 100644 index 00000000000..4441564dda1 --- /dev/null +++ b/devel/tradcpp/patches/patch-macro.c @@ -0,0 +1,38 @@ +$NetBSD: patch-macro.c,v 1.1 2015/06/13 00:10:12 dholland Exp $ + +Upstream patch: don't use "remove" as a local variable as gcc 4.1 gets +upset about it vs. remove(3) in stdio.h. + +diff -r 6947cd2cde79 macro.c +--- macro.c Fri Jun 12 20:06:09 2015 -0400 ++++ macro.c Fri Jun 12 20:06:18 2015 -0400 +@@ -340,7 +340,7 @@ + + static + struct macro * +-macrotable_findlen(const char *name, size_t len, bool remove) ++macrotable_findlen(const char *name, size_t len, bool remove_it) + { + unsigned hash; + struct macroarray *bucket; +@@ -361,7 +361,7 @@ + } + mlen = strlen(m->name); + if (len == mlen && !memcmp(name, m->name, len)) { +- if (remove) { ++ if (remove_it) { + if (i < num-1) { + m2 = macroarray_get(bucket, num-1); + macroarray_set(bucket, i, m2); +@@ -377,9 +377,9 @@ + + static + struct macro * +-macrotable_find(const char *name, bool remove) ++macrotable_find(const char *name, bool remove_it) + { +- return macrotable_findlen(name, strlen(name), remove); ++ return macrotable_findlen(name, strlen(name), remove_it); + } + + static |