diff options
| author | tron <tron@pkgsrc.org> | 2007-02-07 15:18:23 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2007-02-07 15:18:23 +0000 |
| commit | df2f90ff6408acefb2dbc2b3e3e3f9455f86360a (patch) | |
| tree | 5f11b6c4181e0434b86b1a01274e3f28c18e04e6 | |
| parent | ee286ad0cc20844143b8295c848a3db5819fdf9d (diff) | |
| download | pkgsrc-df2f90ff6408acefb2dbc2b3e3e3f9455f86360a.tar.gz | |
Stop the bundled LALR(1) parser generator "lemon" for writing bogus
line numbers into generated ".c" files. The GCC 3.3.3 distributed with
NetBSD-i386 3.3.1 can now build this package without problems.
| -rw-r--r-- | net/wireshark/Makefile | 3 | ||||
| -rw-r--r-- | net/wireshark/distinfo | 3 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-aa | 17 |
3 files changed, 20 insertions, 3 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index bca6b100534..702daedffff 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2007/02/05 07:25:34 tron Exp $ +# $NetBSD: Makefile,v 1.8 2007/02/07 15:18:23 tron Exp $ DISTNAME= wireshark-0.99.5 CATEGORIES= net @@ -17,7 +17,6 @@ USE_TOOLS+= gmake perl pkg-config USE_LIBTOOL= YES SHLIBTOOL_OVERRIDE= # empty -GCC_REQD+= 4.0 GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-gtk2 diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index 816dde6f109..cf90254288c 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.5 2007/02/03 18:06:37 tron Exp $ +$NetBSD: distinfo,v 1.6 2007/02/07 15:18:23 tron Exp $ SHA1 (wireshark-0.99.5.tar.bz2) = ec9a07f13d5cda3d310d8c8900362f7cb96f4042 RMD160 (wireshark-0.99.5.tar.bz2) = 1b3f7bb8e2c73a945fff86fb8ab2aa79481ba809 Size (wireshark-0.99.5.tar.bz2) = 11007039 bytes +SHA1 (patch-aa) = c05ecf25e24bc0c7a7c0a037364b416963736ff3 diff --git a/net/wireshark/patches/patch-aa b/net/wireshark/patches/patch-aa new file mode 100644 index 00000000000..dca719ed38f --- /dev/null +++ b/net/wireshark/patches/patch-aa @@ -0,0 +1,17 @@ +$NetBSD: patch-aa,v 1.6 2007/02/07 15:18:23 tron Exp $ + +Fix build with GCC 3.3.x, see: +http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1357 + +--- tools/lemon/lemon.c.orig 2007-02-01 22:53:43.000000000 +0000 ++++ tools/lemon/lemon.c 2007-02-07 14:54:00.000000000 +0000 +@@ -3095,6 +3095,9 @@ + /* Print a #line directive line to the output file. */ + PRIVATE void tplt_linedir(FILE *out, int lineno, char *filename) + { ++ if (lineno > 65536) ++ return; ++ + fprintf(out,"#line %d \"",lineno); + while( *filename ){ + if( *filename == '\\' ) putc('\\',out); |