diff options
| author | joerg <joerg@pkgsrc.org> | 2011-09-24 19:32:49 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2011-09-24 19:32:49 +0000 |
| commit | 2b5666f0ba4ccb75334a5e9a26043c5e97372d59 (patch) | |
| tree | 90b75a8ce200dbc5b1dda9cf324c77a5b42b74b8 | |
| parent | b23e9bb34ac4eebb6f83eb59ea4b0ac1dd503b53 (diff) | |
| download | pkgsrc-2b5666f0ba4ccb75334a5e9a26043c5e97372d59.tar.gz | |
Redo patch for ctype.h changes on NetBSD. The previous patch could
result e.g. in intmax_t getting defined only in namespace std and broke
the festival build.
| -rw-r--r-- | lang/gcc3/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc3/patches/patch-au | 17 |
2 files changed, 6 insertions, 15 deletions
diff --git a/lang/gcc3/distinfo b/lang/gcc3/distinfo index f430e47ec85..e01c328e8de 100644 --- a/lang/gcc3/distinfo +++ b/lang/gcc3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2011/09/21 13:38:48 joerg Exp $ +$NetBSD: distinfo,v 1.27 2011/09/24 19:32:49 joerg Exp $ SHA1 (gcc-3.3.6.tar.bz2) = 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb RMD160 (gcc-3.3.6.tar.bz2) = b32c7a08c690857f0ac52dda3deb47cf5775d967 @@ -22,4 +22,4 @@ SHA1 (patch-aq) = 1ee8d951e464a154c4f2a3f48d4c2101c2f3d79d SHA1 (patch-ar) = 1ed0338bde1e863ddcfbc0bdfb77aeafdbef7220 SHA1 (patch-as) = 35e1649aed1744be5cdd7caa0b246e74dd9df0aa SHA1 (patch-at) = a8a310b85e661bbf2cb832027b84b72c1db27a0c -SHA1 (patch-au) = 801818472ae456e4e21abd2010b24d3814b77314 +SHA1 (patch-au) = e72e61db43ea22fea3262d436274b748941bbf97 diff --git a/lang/gcc3/patches/patch-au b/lang/gcc3/patches/patch-au index 0f2212f8ec7..19c2c57a0a2 100644 --- a/lang/gcc3/patches/patch-au +++ b/lang/gcc3/patches/patch-au @@ -1,25 +1,16 @@ -$NetBSD: patch-au,v 1.1 2011/09/21 13:38:48 joerg Exp $ +$NetBSD: patch-au,v 1.2 2011/09/24 19:32:49 joerg Exp $ --- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig 2002-06-24 05:48:58.000000000 +0000 +++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h -@@ -36,6 +36,8 @@ - // anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h - // See www.netbsd.org for details of access. - -+#include <sys/param.h> -+ - struct ctype_base - { - // Non-standard typedefs. -@@ -44,6 +46,7 @@ +@@ -44,6 +44,7 @@ // NB: Offsets into ctype<char>::_M_table force a particular size // on the mask type. Because of this, we don't use an enum. typedef unsigned char mask; -+#if __NetBSD_Version__ < 599004100 ++#if !defined(_CTYPE_U) static const mask upper = _U; static const mask lower = _L; static const mask alpha = _U | _L; -@@ -55,4 +58,17 @@ +@@ -55,4 +56,17 @@ static const mask cntrl = _C; static const mask punct = _P; static const mask alnum = _U | _L | _N; |