Tue Nov 20 23:13:11 2012 UTC ()
Use the canonical path to GNU as.

Bump PKGREVISION.


(jperkin)
diff -r1.10 -r1.11 pkgsrc/lang/gcc47/Makefile
cvs diff -r1.10 -r1.11 pkgsrc/lang/gcc47/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc47/Attic/Makefile 2012/10/03 21:56:18 1.10
+++ pkgsrc/lang/gcc47/Attic/Makefile 2012/11/20 23:13:11 1.11
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.10 2012/10/03 21:56:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2012/11/20 23:13:11 jperkin Exp $
2 2
3GCC_PKGNAME= gcc47 3GCC_PKGNAME= gcc47
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC_DIST_VERSION} 6DISTNAME= gcc-${GCC_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC_DIST_VERSION}
8## When bumping the PKGREVISION of this package the PKGREVISION of 8## When bumping the PKGREVISION of this package the PKGREVISION of
9## lang/gcc47-libs needs to be bump to be at least 1 more than the 9## lang/gcc47-libs needs to be bump to be at least 1 more than the
10## PKGREVISION of this package! 10## PKGREVISION of this package!
11PKGREVISION= 5 11PKGREVISION= 6
12CATEGORIES= lang 12CATEGORIES= lang
13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
15 15
16MAINTAINER= sbd@NetBSD.org 16MAINTAINER= sbd@NetBSD.org
17HOMEPAGE= http://gcc.gnu.org/ 17HOMEPAGE= http://gcc.gnu.org/
18COMMENT= The GNU Compiler Collection (GCC) - 4.7 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 4.7 Release Series
19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
20 20
21DISTFILES= ${DEFAULT_DISTFILES} 21DISTFILES= ${DEFAULT_DISTFILES}
22EXTRACT_ONLY= ${DEFAULT_DISTFILES} 22EXTRACT_ONLY= ${DEFAULT_DISTFILES}
23 23
24NOT_FOR_PLATFORM= Interix-*-* 24NOT_FOR_PLATFORM= Interix-*-*
@@ -84,27 +84,27 @@ CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/go @@ -84,27 +84,27 @@ CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/go
84. endif 84. endif
85. if exists(/usr/bin/ld) 85. if exists(/usr/bin/ld)
86CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld 86CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld
87. else 87. else
88CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld 88CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
89. endif 89. endif
90. if exists(/usr/sfw/bin/gas) 90. if exists(/usr/sfw/bin/gas)
91CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas 91CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
92. elif exists(/usr/ccs/bin/as) 92. elif exists(/usr/ccs/bin/as)
93CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as 93CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
94. else 94. else
95BUILDLINK_DEPMETHOD.binutils= full 95BUILDLINK_DEPMETHOD.binutils= full
96. include "../../devel/binutils/buildlink3.mk" 96. include "../../devel/binutils/buildlink3.mk"
97CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/gnu/bin/as 97CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
98. endif 98. endif
99.endif 99.endif
100 100
101pre-configure: 101pre-configure:
102 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR} 102 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
103 103
104TEST_TARGET= -k check || ${TRUE} 104TEST_TARGET= -k check || ${TRUE}
105pre-test: 105pre-test:
106 ${RUN} \ 106 ${RUN} \
107 if runtest --version >/dev/null 2>/dev/null ; then \ 107 if runtest --version >/dev/null 2>/dev/null ; then \
108 : ; \ 108 : ; \
109 else \ 109 else \
110 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \ 110 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \