diff options
| author | wiz <wiz@pkgsrc.org> | 2010-12-23 15:25:16 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2010-12-23 15:25:16 +0000 |
| commit | b0a2ef007d519ef32410831dc10d9515ecf3bd9e (patch) | |
| tree | 0e056205270bdd125ae5241596fbfac216ddaeef /lang | |
| parent | 379fe7da3b26949376b0c0b6ccce1b4e173aa4fd (diff) | |
| download | pkgsrc-b0a2ef007d519ef32410831dc10d9515ecf3bd9e.tar.gz | |
Fix patch-ac for NetBSD<5.99.41.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc34/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc34/patches/patch-ac | 39 |
2 files changed, 16 insertions, 27 deletions
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo index d0d8f730fb6..4614f6ba14c 100644 --- a/lang/gcc34/distinfo +++ b/lang/gcc34/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.21 2010/12/20 00:04:50 wiz Exp $ +$NetBSD: distinfo,v 1.22 2010/12/23 15:25:16 wiz Exp $ SHA1 (gcc-3.4.6.tar.bz2) = 97b290fdc572c8e490b3b39f243e69bacad23c2b RMD160 (gcc-3.4.6.tar.bz2) = b15003368cedc7964f6ceaee0c39ddc43a46c442 Size (gcc-3.4.6.tar.bz2) = 28193401 bytes SHA1 (patch-aa) = 40ba26c4af81ecc0effce3b7ac3c74bdfe4b56a6 SHA1 (patch-ab) = 50345471e99264104e136acd7c09da0a5275cb62 -SHA1 (patch-ac) = 75620fe258114faaf8020bb073e7e840b23b1ccc +SHA1 (patch-ac) = 522c6faf5f70dc959c77f24fff75aca9cfacdd13 SHA1 (patch-ae) = 928fa6155e614ca85b02359cf893d6c62231b192 SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715 diff --git a/lang/gcc34/patches/patch-ac b/lang/gcc34/patches/patch-ac index 9427ec0432b..5f287c70d84 100644 --- a/lang/gcc34/patches/patch-ac +++ b/lang/gcc34/patches/patch-ac @@ -1,41 +1,29 @@ -$NetBSD: patch-ac,v 1.1 2010/12/20 00:04:50 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2010/12/23 15:25:16 wiz Exp $ ---- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig 2002-06-24 05:50:58.000000000 +0000 +--- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig 2002-06-24 07:50:58.000000000 +0200 +++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h -@@ -36,6 +36,18 @@ +@@ -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> -+#if __NetBSD_Version__ < 599004100 -+#define _U _CTYPE_U -+#define _L _CTYPE_L -+#define _N _CTYPE_N -+#define _X _CTYPE_X -+#define _S _CTYPE_S -+#define _P _CTYPE_P -+#define _B _CTYPE_B -+#define _C _CTYPE_C -+#endif + struct ctype_base { // Non-standard typedefs. -@@ -44,15 +56,15 @@ +@@ -44,6 +46,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; -- static const mask upper = _U; -- static const mask lower = _L; -- static const mask alpha = _U | _L; -- static const mask digit = _N; -- static const mask xdigit = _N | _X; -- static const mask space = _S; -- static const mask print = _P | _U | _L | _N | _B; -- static const mask graph = _P | _U | _L | _N; -- static const mask cntrl = _C; -- static const mask punct = _P; -- static const mask alnum = _U | _L | _N; ++#if __NetBSD_Version__ < 599004100 + static const mask upper = _U; + static const mask lower = _L; + static const mask alpha = _U | _L; +@@ -55,4 +58,17 @@ + static const mask cntrl = _C; + static const mask punct = _P; + static const mask alnum = _U | _L | _N; ++#else + static const mask upper = _CTYPE_U; + static const mask lower = _CTYPE_L; + static const mask alpha = _CTYPE_U | _CTYPE_L; @@ -47,4 +35,5 @@ $NetBSD: patch-ac,v 1.1 2010/12/20 00:04:50 wiz Exp $ + static const mask cntrl = _CTYPE_C; + static const mask punct = _CTYPE_P; + static const mask alnum = _CTYPE_U | _CTYPE_L | _CTYPE_N; ++#endif }; |