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 | 2d4383ab6bc873d183f5f6f6ca2f26aec3772467 (patch) | |
| tree | 5e81797f1059680a0a38ac73f337acc62a66f629 /lang/gcc44 | |
| parent | 2f567b9679ab294631110c1e78dc5e1a5e358465 (diff) | |
| download | pkgsrc-2d4383ab6bc873d183f5f6f6ca2f26aec3772467.tar.gz | |
Redo netbsd/ctype_base.h patch to not pollute the namespace as much with
sys/param.h.
Diffstat (limited to 'lang/gcc44')
| -rw-r--r-- | lang/gcc44/Makefile | 4 | ||||
| -rw-r--r-- | lang/gcc44/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc44/patches/patch-aj | 17 |
3 files changed, 8 insertions, 17 deletions
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index dba1ea08bd1..467f177c01d 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2012/04/13 11:01:32 hans Exp $ +# $NetBSD: Makefile,v 1.36 2012/06/08 15:42:28 joerg Exp $ DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc44-${GCC_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/} EXTRACT_SUFX= .tar.bz2 diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo index ff24a2f6a4e..5a332102f33 100644 --- a/lang/gcc44/distinfo +++ b/lang/gcc44/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2012/05/03 12:20:18 hans Exp $ +$NetBSD: distinfo,v 1.15 2012/06/08 15:42:28 joerg Exp $ SHA1 (gcc-4.4.7.tar.bz2) = a6c834b0c2f58583da1d093de7a81a20ede9af75 RMD160 (gcc-4.4.7.tar.bz2) = 481609ebff38bf8a1fdf9a300dc460c1f425836a @@ -8,7 +8,7 @@ SHA1 (patch-ad) = 96722d5af63a955e3d9c934b1249e5e8a1173a8c SHA1 (patch-af) = 12f58f01e973f5684e8443ab402a70291bb6d621 SHA1 (patch-ag) = 0897b7ed75b4dc7d6ad50ecfa886edca7e29703b SHA1 (patch-ai) = 96ffd5c07761a53dbb036930c49e4c84574455c7 -SHA1 (patch-aj) = cde99b36f7f7dcf220ef4451108ad1ff7410a6a6 +SHA1 (patch-aj) = efc6e550f2a7b5e0181a9e2fb97b4cb94c6eb2da SHA1 (patch-ak) = 08da661b8b19fdd9fa086f67b185266c1d378658 SHA1 (patch-al) = 462059744f7f057f13d6c472d0aff9d012546082 SHA1 (patch-am) = fcfabcec9e6d0b8e9ada348dc65e8ddb890f96ca diff --git a/lang/gcc44/patches/patch-aj b/lang/gcc44/patches/patch-aj index 09eb78211ea..1576950cde6 100644 --- a/lang/gcc44/patches/patch-aj +++ b/lang/gcc44/patches/patch-aj @@ -1,21 +1,12 @@ -$NetBSD: patch-aj,v 1.2 2011/05/14 18:00:24 wiz Exp $ +$NetBSD: patch-aj,v 1.3 2012/06/08 15:42:29 joerg Exp $ --- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig 2009-04-09 23:23:07.000000000 +0000 +++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h -@@ -30,6 +30,8 @@ - // 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 +44,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std) +@@ -42,6 +42,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // 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 = _CTYPE_U; + static const mask lower = _CTYPE_L; + static const mask alpha = _CTYPE_U | _CTYPE_L; @@ -31,7 +22,7 @@ $NetBSD: patch-aj,v 1.2 2011/05/14 18:00:24 wiz Exp $ static const mask upper = _U; static const mask lower = _L; static const mask alpha = _U | _L; -@@ -53,6 +68,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) +@@ -53,6 +66,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) static const mask cntrl = _C; static const mask punct = _P; static const mask alnum = _U | _L | _N; |