diff options
| author | joerg <joerg@pkgsrc.org> | 2009-02-28 18:37:22 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-02-28 18:37:22 +0000 |
| commit | bb65b2534be05172aef54681742ebed684ae95fc (patch) | |
| tree | ae96e83ca86af2b00d520c7168a8321f3c8cd36c | |
| parent | a07884cea082ceb369319572e769603ce7bae315 (diff) | |
| download | pkgsrc-bb65b2534be05172aef54681742ebed684ae95fc.tar.gz | |
Fix C++ build on NetBSD 5.x. Bump revision of gcc3-c.
Inspired by patch from Aran Clauson in the GCC Bugzilla.
| -rw-r--r-- | lang/gcc3-c/Makefile | 3 | ||||
| -rw-r--r-- | lang/gcc3/distinfo | 3 | ||||
| -rw-r--r-- | lang/gcc3/patches/patch-at | 24 |
3 files changed, 28 insertions, 2 deletions
diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile index f1eae06fad8..0a532e9e3b4 100644 --- a/lang/gcc3-c/Makefile +++ b/lang/gcc3-c/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2007/10/25 21:04:22 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2009/02/28 18:37:22 joerg Exp $ PKGNAME= gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION} +PKGREVISION= 1 COMMENT= GNU Compiler Collection, v3 - C compiler PKG_DESTDIR_SUPPORT= user-destdir diff --git a/lang/gcc3/distinfo b/lang/gcc3/distinfo index f97fe82016d..dd829ddcd72 100644 --- a/lang/gcc3/distinfo +++ b/lang/gcc3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2007/11/03 17:16:37 rillig Exp $ +$NetBSD: distinfo,v 1.25 2009/02/28 18:37:22 joerg Exp $ SHA1 (gcc-3.3.6.tar.bz2) = 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb RMD160 (gcc-3.3.6.tar.bz2) = b32c7a08c690857f0ac52dda3deb47cf5775d967 @@ -21,3 +21,4 @@ SHA1 (patch-ap) = d2f55ff6992f6afb106b3c861a8eee0a5b7bd70e SHA1 (patch-aq) = 1ee8d951e464a154c4f2a3f48d4c2101c2f3d79d SHA1 (patch-ar) = 1ed0338bde1e863ddcfbc0bdfb77aeafdbef7220 SHA1 (patch-as) = 35e1649aed1744be5cdd7caa0b246e74dd9df0aa +SHA1 (patch-at) = a8a310b85e661bbf2cb832027b84b72c1db27a0c diff --git a/lang/gcc3/patches/patch-at b/lang/gcc3/patches/patch-at new file mode 100644 index 00000000000..4201541bd72 --- /dev/null +++ b/lang/gcc3/patches/patch-at @@ -0,0 +1,24 @@ +$NetBSD: patch-at,v 1.1 2009/02/28 18:37:22 joerg Exp $ + +Alternative fix for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38182 + +--- gcc/ginclude/stddef.h.orig 2009-02-28 18:57:06.000000000 +0100 ++++ gcc/ginclude/stddef.h +@@ -64,7 +64,7 @@ Boston, MA 02111-1307, USA. */ + /* In 4.3bsd-net2, machine/ansi.h defines these symbols, which are + defined if the corresponding type is *not* defined. + FreeBSD-2.1 defines _MACHINE_ANSI_H_ instead of _ANSI_H_ */ +-#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) ++#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) || defined(__NetBSD__) + #if !defined(_SIZE_T_) && !defined(_BSD_SIZE_T_) + #define _SIZE_T + #endif +@@ -359,7 +359,7 @@ typedef __WINT_TYPE__ wint_t; + /* In 4.3bsd-net2, leave these undefined to indicate that size_t, etc. + are already defined. */ + /* BSD/OS 3.1 and FreeBSD [23].x require the MACHINE_ANSI_H check here. */ +-#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) ++#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) || defined(__NetBSD__) + /* The references to _GCC_PTRDIFF_T_, _GCC_SIZE_T_, and _GCC_WCHAR_T_ + are probably typos and should be removed before 2.8 is released. */ + #ifdef _GCC_PTRDIFF_T_ |