Sat Feb 28 18:37:22 2009 UTC ()
Fix C++ build on NetBSD 5.x. Bump revision of gcc3-c.
Inspired by patch from Aran Clauson in the GCC Bugzilla.


(joerg)
diff -r1.24 -r1.25 pkgsrc/lang/gcc3/distinfo
diff -r1.23 -r1.24 pkgsrc/lang/gcc3-c/Makefile
diff -r0 -r1.1 pkgsrc/lang/gcc3/patches/patch-at
cvs diff -r1.24 -r1.25 pkgsrc/lang/gcc3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/gcc3/Attic/distinfo 2007/11/03 17:16:37 1.24
+++ pkgsrc/lang/gcc3/Attic/distinfo 2009/02/28 18:37:22 1.25
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1$NetBSD: distinfo,v 1.24 2007/11/03 17:16:37 rillig Exp $ 1$NetBSD: distinfo,v 1.25 2009/02/28 18:37:22 joerg Exp $
2 2
3SHA1 (gcc-3.3.6.tar.bz2) = 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb 3SHA1 (gcc-3.3.6.tar.bz2) = 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb
4RMD160 (gcc-3.3.6.tar.bz2) = b32c7a08c690857f0ac52dda3deb47cf5775d967 4RMD160 (gcc-3.3.6.tar.bz2) = b32c7a08c690857f0ac52dda3deb47cf5775d967
5Size (gcc-3.3.6.tar.bz2) = 23972413 bytes 5Size (gcc-3.3.6.tar.bz2) = 23972413 bytes
6SHA1 (patch-aa) = 2b8d1fcbe1f8028a6a011e85bb3ef9c1a9373b36 6SHA1 (patch-aa) = 2b8d1fcbe1f8028a6a011e85bb3ef9c1a9373b36
7SHA1 (patch-ab) = 304d640028f56cc17e9c79faf3f3a67ee50335d0 7SHA1 (patch-ab) = 304d640028f56cc17e9c79faf3f3a67ee50335d0
8SHA1 (patch-ac) = cc44ff46579900173b24ea4c39070a8b97450ce2 8SHA1 (patch-ac) = cc44ff46579900173b24ea4c39070a8b97450ce2
9SHA1 (patch-ad) = 00d8def03bc48cde0b03331ea6b846cc0997f0fe 9SHA1 (patch-ad) = 00d8def03bc48cde0b03331ea6b846cc0997f0fe
10SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741 10SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741
11SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515 11SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515
12SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c 12SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c
13SHA1 (patch-ah) = bad03ed13de00bd5d677c8920dc6c1c9fdc60e71 13SHA1 (patch-ah) = bad03ed13de00bd5d677c8920dc6c1c9fdc60e71
14SHA1 (patch-ai) = bb9f4975769cd104b25b4609a1d4c888bb147bb1 14SHA1 (patch-ai) = bb9f4975769cd104b25b4609a1d4c888bb147bb1
15SHA1 (patch-aj) = bfbf65150fd6f0eaa50af68bb8e892fff4a2051e 15SHA1 (patch-aj) = bfbf65150fd6f0eaa50af68bb8e892fff4a2051e
16SHA1 (patch-ak) = 53b91c8315e5e2ccb5d74058bdfd33c6f8431ad6 16SHA1 (patch-ak) = 53b91c8315e5e2ccb5d74058bdfd33c6f8431ad6
17SHA1 (patch-al) = 6294061358e2b618a980e77cbf7bad6231feacbe 17SHA1 (patch-al) = 6294061358e2b618a980e77cbf7bad6231feacbe
18SHA1 (patch-am) = 8eff72d76b135a9b0318de651341cb08976758b5 18SHA1 (patch-am) = 8eff72d76b135a9b0318de651341cb08976758b5
19SHA1 (patch-an) = c0795339102b4608a3813c3a2d488c71ea972d6f 19SHA1 (patch-an) = c0795339102b4608a3813c3a2d488c71ea972d6f
20SHA1 (patch-ap) = d2f55ff6992f6afb106b3c861a8eee0a5b7bd70e 20SHA1 (patch-ap) = d2f55ff6992f6afb106b3c861a8eee0a5b7bd70e
21SHA1 (patch-aq) = 1ee8d951e464a154c4f2a3f48d4c2101c2f3d79d 21SHA1 (patch-aq) = 1ee8d951e464a154c4f2a3f48d4c2101c2f3d79d
22SHA1 (patch-ar) = 1ed0338bde1e863ddcfbc0bdfb77aeafdbef7220 22SHA1 (patch-ar) = 1ed0338bde1e863ddcfbc0bdfb77aeafdbef7220
23SHA1 (patch-as) = 35e1649aed1744be5cdd7caa0b246e74dd9df0aa 23SHA1 (patch-as) = 35e1649aed1744be5cdd7caa0b246e74dd9df0aa
 24SHA1 (patch-at) = a8a310b85e661bbf2cb832027b84b72c1db27a0c
cvs diff -r1.23 -r1.24 pkgsrc/lang/gcc3-c/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc3-c/Attic/Makefile 2007/10/25 21:04:22 1.23
+++ pkgsrc/lang/gcc3-c/Attic/Makefile 2009/02/28 18:37:22 1.24
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.23 2007/10/25 21:04:22 jlam Exp $ 1# $NetBSD: Makefile,v 1.24 2009/02/28 18:37:22 joerg Exp $
2 2
3PKGNAME= gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION} 3PKGNAME= gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}
 4PKGREVISION= 1
4COMMENT= GNU Compiler Collection, v3 - C compiler 5COMMENT= GNU Compiler Collection, v3 - C compiler
5 6
6PKG_DESTDIR_SUPPORT= user-destdir 7PKG_DESTDIR_SUPPORT= user-destdir
7 8
8INFO_FILES= yes 9INFO_FILES= yes
9 10
10.include "../../lang/gcc3/Makefile.common" 11.include "../../lang/gcc3/Makefile.common"
11 12
12# The "gcc" frontend knows all languages (by patch) 13# The "gcc" frontend knows all languages (by patch)
13CONFIGURE_ARGS+= --enable-languages=c 14CONFIGURE_ARGS+= --enable-languages=c
14 15
15MAKE_ENV+= ALL_GCC=${ALL_GCC:Q} 16MAKE_ENV+= ALL_GCC=${ALL_GCC:Q}
16MAKE_ENV+= ALL_GCC_C=${ALL_GCC_C:Q} 17MAKE_ENV+= ALL_GCC_C=${ALL_GCC_C:Q}
File Added: pkgsrc/lang/gcc3/patches/Attic/patch-at
$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_