Fri Feb 1 07:50:01 2008 UTC ()
gcc-2 needs to be built with gcc3 on netbsd-4. From Aleksej Saushev.


(tnn)
diff -r1.90 -r1.91 pkgsrc/lang/gcc/Makefile
cvs diff -r1.90 -r1.91 pkgsrc/lang/gcc/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc/Attic/Makefile 2007/06/12 20:10:17 1.90
+++ pkgsrc/lang/gcc/Attic/Makefile 2008/02/01 07:50:01 1.91
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.90 2007/06/12 20:10:17 joerg Exp $ 1# $NetBSD: Makefile,v 1.91 2008/02/01 07:50:01 tnn Exp $
2 2
3DISTNAME= gcc-2.95.3 3DISTNAME= gcc-2.95.3
4PKGREVISION= 7 4PKGREVISION= 7
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_GNU:=gcc/} 6MASTER_SITES= ${MASTER_SITE_GNU:=gcc/}
7 7
8PATCH_SITES= ${MASTER_SITE_LOCAL} 8PATCH_SITES= ${MASTER_SITE_LOCAL}
9PATCHFILES= gcc-2.95.3-diff-2002-08-29.gz 9PATCHFILES= gcc-2.95.3-diff-2002-08-29.gz
10 10
11# 11#
12# Synced from patches against main source tree as of 2002-03-28 12# Synced from patches against main source tree as of 2002-03-28
13# 13#
14MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
@@ -33,26 +33,31 @@ MAKE_ENV+= SHELL=${CONFIG_SHELL} @@ -33,26 +33,31 @@ MAKE_ENV+= SHELL=${CONFIG_SHELL}
33CONFIGURE_DIRS= ${WRKDIR}/objdir 33CONFIGURE_DIRS= ${WRKDIR}/objdir
34BUILD_DIRS= ${CONFIGURE_DIRS} 34BUILD_DIRS= ${CONFIGURE_DIRS}
35 35
36FILES_SUBST+= DISTNAME=${DISTNAME:Q} \ 36FILES_SUBST+= DISTNAME=${DISTNAME:Q} \
37 GCC_PREFIX=${GCC_PREFIX:Q} 37 GCC_PREFIX=${GCC_PREFIX:Q}
38MESSAGE_SUBST+= DISTNAME=${DISTNAME} 38MESSAGE_SUBST+= DISTNAME=${DISTNAME}
39PLIST_SUBST+= DISTNAME=${DISTNAME:Q} \ 39PLIST_SUBST+= DISTNAME=${DISTNAME:Q} \
40 GCC_PREFIX=${GCC_PREFIX:S|^${PREFIX}/||:Q} 40 GCC_PREFIX=${GCC_PREFIX:S|^${PREFIX}/||:Q}
41 41
42INFO_FILES= # PLIST 42INFO_FILES= # PLIST
43 43
44.include "../../mk/bsd.prefs.mk" 44.include "../../mk/bsd.prefs.mk"
45 45
 46.if !empty(MACHINE_PLATFORM:MNetBSD-4*)
 47GCC_REQD+= 3.0
 48USE_PKGSRC_GCC= yes
 49.endif
 50
46.if ${OPSYS} == "SunOS" 51.if ${OPSYS} == "SunOS"
47CONFLICTS+= gcc-[0-9]* pgcc-[0-9]* 52CONFLICTS+= gcc-[0-9]* pgcc-[0-9]*
48. if ${CC:M*gcc*} == "" 53. if ${CC:M*gcc*} == ""
49BUILD_TARGET= bootstrap 54BUILD_TARGET= bootstrap
50. endif 55. endif
51# we know it's a GNU toolchain on Linux and the BSDs. 56# we know it's a GNU toolchain on Linux and the BSDs.
52.elif ${OPSYS:M*BSD} != "" || ${OPSYS} == "Linux" 57.elif ${OPSYS:M*BSD} != "" || ${OPSYS} == "Linux"
53CONFIGURE_ARGS+= --with-gnu-as 58CONFIGURE_ARGS+= --with-gnu-as
54CONFIGURE_ARGS+= --with-gnu-ld 59CONFIGURE_ARGS+= --with-gnu-ld
55.else 60.else
56# play it safe, force a bootstrap build if we don't know for sure it 61# play it safe, force a bootstrap build if we don't know for sure it
57# is gcc. 62# is gcc.
58. if ${CC:M*gcc*} == "" 63. if ${CC:M*gcc*} == ""