diff options
| author | joerg <joerg@pkgsrc.org> | 2012-06-08 15:42:28 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-06-08 15:42:28 +0000 |
| commit | 60932acbe7c6e4c3e10c0bfa659beb9d2df3d605 (patch) | |
| tree | 5e81797f1059680a0a38ac73f337acc62a66f629 /lang/gcc45 | |
| parent | 11ddafbf3bdefd5068356f5982ec9bb3bd18cfec (diff) | |
| download | pkgsrc-60932acbe7c6e4c3e10c0bfa659beb9d2df3d605.tar.gz | |
Redo netbsd/ctype_base.h patch to not pollute the namespace as much with
sys/param.h.
Diffstat (limited to 'lang/gcc45')
| -rw-r--r-- | lang/gcc45/Makefile | 4 | ||||
| -rw-r--r-- | lang/gcc45/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc45/patches/patch-aj | 16 |
3 files changed, 8 insertions, 16 deletions
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile index fe67876451f..3da2ab50aef 100644 --- a/lang/gcc45/Makefile +++ b/lang/gcc45/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2012/06/02 11:55:50 cheusov Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/08 15:42:29 joerg Exp $ DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc45-${GCC_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/} EXTRACT_SUFX= .tar.bz2 diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo index 6ce0378a486..791c3d8be74 100644 --- a/lang/gcc45/distinfo +++ b/lang/gcc45/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2012/05/03 12:20:19 hans Exp $ +$NetBSD: distinfo,v 1.6 2012/06/08 15:42:29 joerg Exp $ SHA1 (gcc-4.5.3.tar.bz2) = 73c45dfda5eef6b124be53e56828b5925198cc1b RMD160 (gcc-4.5.3.tar.bz2) = d07aa90f2186b4e082dfd5ad5d5188c097fb6247 @@ -10,5 +10,5 @@ SHA1 (patch-ad) = b72c93d8477a567363616717e20eef1b33e7d307 SHA1 (patch-af) = 54fb9fb3438eb7c646b9d51b6b0cf3ded27d4989 SHA1 (patch-ag) = b58f8b82fcf17c60eb2700bc54d6625ca45e542b SHA1 (patch-ah) = a963394b0434b82494b7510d4b2705f77acfb668 -SHA1 (patch-aj) = 7935c4c44b3942097129fdda2336de1ea0c83215 +SHA1 (patch-aj) = e07b71a5fc5e3835d10eaad33fc722d040bcc379 SHA1 (patch-ak) = 3d8a859ba436a4b204bb99f59cd5331d695aa811 diff --git a/lang/gcc45/patches/patch-aj b/lang/gcc45/patches/patch-aj index 46040c37433..60f5247ca31 100644 --- a/lang/gcc45/patches/patch-aj +++ b/lang/gcc45/patches/patch-aj @@ -1,24 +1,16 @@ -$NetBSD: patch-aj,v 1.1.1.1 2011/05/14 20:19:47 wiz Exp $ +$NetBSD: patch-aj,v 1.2 2012/06/08 15:42:29 joerg Exp $ --- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig 2011-02-23 18:48:42.000000000 +0100 +++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h -@@ -30,6 +30,7 @@ - // Full details can be found from the CVS files at: - // anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h - // See www.netbsd.org for details of access. -+#include <sys/param.h> - - _GLIBCXX_BEGIN_NAMESPACE(std) - -@@ -42,6 +43,7 @@ +@@ -42,6 +42,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; -@@ -53,6 +55,19 @@ +@@ -53,6 +54,19 @@ static const mask cntrl = _C; static const mask punct = _P; static const mask alnum = _U | _L | _N; |