Fix C++ build on NetBSD 5.x. Bump revision of gcc3-c. Inspired by patch from Aran Clauson in the GCC Bugzilla.diff -r1.24 -r1.25 pkgsrc/lang/gcc3/distinfo
(joerg)
@@ -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 | |||
3 | SHA1 (gcc-3.3.6.tar.bz2) = 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb | 3 | SHA1 (gcc-3.3.6.tar.bz2) = 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb | |
4 | RMD160 (gcc-3.3.6.tar.bz2) = b32c7a08c690857f0ac52dda3deb47cf5775d967 | 4 | RMD160 (gcc-3.3.6.tar.bz2) = b32c7a08c690857f0ac52dda3deb47cf5775d967 | |
5 | Size (gcc-3.3.6.tar.bz2) = 23972413 bytes | 5 | Size (gcc-3.3.6.tar.bz2) = 23972413 bytes | |
6 | SHA1 (patch-aa) = 2b8d1fcbe1f8028a6a011e85bb3ef9c1a9373b36 | 6 | SHA1 (patch-aa) = 2b8d1fcbe1f8028a6a011e85bb3ef9c1a9373b36 | |
7 | SHA1 (patch-ab) = 304d640028f56cc17e9c79faf3f3a67ee50335d0 | 7 | SHA1 (patch-ab) = 304d640028f56cc17e9c79faf3f3a67ee50335d0 | |
8 | SHA1 (patch-ac) = cc44ff46579900173b24ea4c39070a8b97450ce2 | 8 | SHA1 (patch-ac) = cc44ff46579900173b24ea4c39070a8b97450ce2 | |
9 | SHA1 (patch-ad) = 00d8def03bc48cde0b03331ea6b846cc0997f0fe | 9 | SHA1 (patch-ad) = 00d8def03bc48cde0b03331ea6b846cc0997f0fe | |
10 | SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741 | 10 | SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741 | |
11 | SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515 | 11 | SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515 | |
12 | SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c | 12 | SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c | |
13 | SHA1 (patch-ah) = bad03ed13de00bd5d677c8920dc6c1c9fdc60e71 | 13 | SHA1 (patch-ah) = bad03ed13de00bd5d677c8920dc6c1c9fdc60e71 | |
14 | SHA1 (patch-ai) = bb9f4975769cd104b25b4609a1d4c888bb147bb1 | 14 | SHA1 (patch-ai) = bb9f4975769cd104b25b4609a1d4c888bb147bb1 | |
15 | SHA1 (patch-aj) = bfbf65150fd6f0eaa50af68bb8e892fff4a2051e | 15 | SHA1 (patch-aj) = bfbf65150fd6f0eaa50af68bb8e892fff4a2051e | |
16 | SHA1 (patch-ak) = 53b91c8315e5e2ccb5d74058bdfd33c6f8431ad6 | 16 | SHA1 (patch-ak) = 53b91c8315e5e2ccb5d74058bdfd33c6f8431ad6 | |
17 | SHA1 (patch-al) = 6294061358e2b618a980e77cbf7bad6231feacbe | 17 | SHA1 (patch-al) = 6294061358e2b618a980e77cbf7bad6231feacbe | |
18 | SHA1 (patch-am) = 8eff72d76b135a9b0318de651341cb08976758b5 | 18 | SHA1 (patch-am) = 8eff72d76b135a9b0318de651341cb08976758b5 | |
19 | SHA1 (patch-an) = c0795339102b4608a3813c3a2d488c71ea972d6f | 19 | SHA1 (patch-an) = c0795339102b4608a3813c3a2d488c71ea972d6f | |
20 | SHA1 (patch-ap) = d2f55ff6992f6afb106b3c861a8eee0a5b7bd70e | 20 | SHA1 (patch-ap) = d2f55ff6992f6afb106b3c861a8eee0a5b7bd70e | |
21 | SHA1 (patch-aq) = 1ee8d951e464a154c4f2a3f48d4c2101c2f3d79d | 21 | SHA1 (patch-aq) = 1ee8d951e464a154c4f2a3f48d4c2101c2f3d79d | |
22 | SHA1 (patch-ar) = 1ed0338bde1e863ddcfbc0bdfb77aeafdbef7220 | 22 | SHA1 (patch-ar) = 1ed0338bde1e863ddcfbc0bdfb77aeafdbef7220 | |
23 | SHA1 (patch-as) = 35e1649aed1744be5cdd7caa0b246e74dd9df0aa | 23 | SHA1 (patch-as) = 35e1649aed1744be5cdd7caa0b246e74dd9df0aa | |
24 | SHA1 (patch-at) = a8a310b85e661bbf2cb832027b84b72c1db27a0c |
@@ -1,48 +1,49 @@ | @@ -1,48 +1,49 @@ | |||
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 | |||
3 | PKGNAME= gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION} | 3 | PKGNAME= gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION} | |
4 | PKGREVISION= 1 | |||
4 | COMMENT= GNU Compiler Collection, v3 - C compiler | 5 | COMMENT= GNU Compiler Collection, v3 - C compiler | |
5 | 6 | |||
6 | PKG_DESTDIR_SUPPORT= user-destdir | 7 | PKG_DESTDIR_SUPPORT= user-destdir | |
7 | 8 | |||
8 | INFO_FILES= yes | 9 | INFO_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) | |
13 | CONFIGURE_ARGS+= --enable-languages=c | 14 | CONFIGURE_ARGS+= --enable-languages=c | |
14 | 15 | |||
15 | MAKE_ENV+= ALL_GCC=${ALL_GCC:Q} | 16 | MAKE_ENV+= ALL_GCC=${ALL_GCC:Q} | |
16 | MAKE_ENV+= ALL_GCC_C=${ALL_GCC_C:Q} | 17 | MAKE_ENV+= ALL_GCC_C=${ALL_GCC_C:Q} | |
17 | MAKE_ENV+= ALL_GCC_CCC=${ALL_GCCXX_C:Q} | 18 | MAKE_ENV+= ALL_GCC_CCC=${ALL_GCCXX_C:Q} | |
18 | 19 | |||
19 | .include "../../mk/compiler.mk" | 20 | .include "../../mk/compiler.mk" | |
20 | 21 | |||
21 | .if empty(CC_VERSION:Mgcc-*) | 22 | .if empty(CC_VERSION:Mgcc-*) | |
22 | BUILD_TARGET= bootstrap | 23 | BUILD_TARGET= bootstrap | |
23 | .endif | 24 | .endif | |
24 | 25 | |||
25 | post-build: | 26 | post-build: | |
26 | ${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc3.mk > ${WRKDIR}/gcc3.mk | 27 | ${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc3.mk > ${WRKDIR}/gcc3.mk | |
27 | 28 | |||
28 | GENERATE_PLIST+= \ | 29 | GENERATE_PLIST+= \ | |
29 | ${FIND} ${DESTDIR:Q}${GCC_PREFIX} \( -type f -o -type l \) -print \ | 30 | ${FIND} ${DESTDIR:Q}${GCC_PREFIX} \( -type f -o -type l \) -print \ | |
30 | | ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g"; \ | 31 | | ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g"; \ | |
31 | ${FIND} ${DESTDIR:Q}${GCC_PREFIX} -type d -print \ | 32 | ${FIND} ${DESTDIR:Q}${GCC_PREFIX} -type d -print \ | |
32 | | ${SORT} -r | ${SED} -e "s,${DESTDIR}${PREFIX}/,@dirrm ,g"; | 33 | | ${SORT} -r | ${SED} -e "s,${DESTDIR}${PREFIX}/,@dirrm ,g"; | |
33 | 34 | |||
34 | post-install: | 35 | post-install: | |
35 | .if ${OPSYS} == "SunOS" | 36 | .if ${OPSYS} == "SunOS" | |
36 | cd ${DESTDIR:Q}${GCC_ARCHDIR}/include && ${RM} -f fixed | 37 | cd ${DESTDIR:Q}${GCC_ARCHDIR}/include && ${RM} -f fixed | |
37 | .if exists(${DESTDIR}${GCC_ARCHDIR}/include/v7) | 38 | .if exists(${DESTDIR}${GCC_ARCHDIR}/include/v7) | |
38 | ${RMDIR} ${DESTDIR:Q}${GCC_ARCHDIR}/include/v7 | 39 | ${RMDIR} ${DESTDIR:Q}${GCC_ARCHDIR}/include/v7 | |
39 | .endif | 40 | .endif | |
40 | .if exists(${DESTDIR}${GCC_ARCHDIR}/include/v9) | 41 | .if exists(${DESTDIR}${GCC_ARCHDIR}/include/v9) | |
41 | ${RMDIR} ${DESTDIR:Q}${GCC_ARCHDIR}/include/v9 | 42 | ${RMDIR} ${DESTDIR:Q}${GCC_ARCHDIR}/include/v9 | |
42 | .endif | 43 | .endif | |
43 | .endif | 44 | .endif | |
44 | ${INSTALL_DATA_DIR} ${DESTDIR:Q}${GCC_PREFIX}/mk | 45 | ${INSTALL_DATA_DIR} ${DESTDIR:Q}${GCC_PREFIX}/mk | |
45 | ${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${DESTDIR:Q}${GCC_PREFIX}/mk/c.mk | 46 | ${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${DESTDIR:Q}${GCC_PREFIX}/mk/c.mk | |
46 | ${LN} -f ${DESTDIR:Q}${GCC_PREFIX}/bin/gcc ${DESTDIR:Q}${GCC_PREFIX}/bin/cc | 47 | ${LN} -f ${DESTDIR:Q}${GCC_PREFIX}/bin/gcc ${DESTDIR:Q}${GCC_PREFIX}/bin/cc | |
47 | 48 | |||
48 | .include "../../mk/bsd.pkg.mk" | 49 | .include "../../mk/bsd.pkg.mk" |
$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_