Sat Mar 23 19:10:45 2013 UTC ()
Readd i386 fix, but for Linux and NetBSD only.
Ok jperkin.


(wiz)
diff -r1.18 -r1.19 pkgsrc/lang/gcc47/Makefile
cvs diff -r1.18 -r1.19 pkgsrc/lang/gcc47/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc47/Attic/Makefile 2013/03/21 22:47:24 1.18
+++ pkgsrc/lang/gcc47/Attic/Makefile 2013/03/23 19:10:45 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.18 2013/03/21 22:47:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2013/03/23 19:10:45 wiz 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= 2 11PKGREVISION= 2
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
@@ -67,26 +67,30 @@ CONFIGURE_ARGS+= --enable-long-long @@ -67,26 +67,30 @@ CONFIGURE_ARGS+= --enable-long-long
67CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} 67CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
68CONFIGURE_ARGS+= --enable-libssp 68CONFIGURE_ARGS+= --enable-libssp
69CONFIGURE_ARGS+= --enable-threads=posix 69CONFIGURE_ARGS+= --enable-threads=posix
70CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} 70CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q}
71.if ${OPSYS} == "NetBSD" 71.if ${OPSYS} == "NetBSD"
72CONFIGURE_ARGS+= --with-gnu-ld --with-ld=/usr/bin/ld 72CONFIGURE_ARGS+= --with-gnu-ld --with-ld=/usr/bin/ld
73CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/bin/as 73CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/bin/as
74MAKE_ENV+= ac_cv_func_clock_gettime=yes 74MAKE_ENV+= ac_cv_func_clock_gettime=yes
75.endif 75.endif
76.if ${OPSYS} == "DragonFly" 76.if ${OPSYS} == "DragonFly"
77CONFIGURE_ARGS+= --disable-bootstrap 77CONFIGURE_ARGS+= --disable-bootstrap
78.endif 78.endif
79 79
 80.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
 81CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
 82.endif
 83
80.include "options.mk" 84.include "options.mk"
81 85
82# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into 86# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
83# a binary so we need to make sure we give it the installed sed and not 87# a binary so we need to make sure we give it the installed sed and not
84# the tool wrapped one. 88# the tool wrapped one.
85MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED} 89MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED}
86MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} 90MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
87 91
88# Determine whether to use binutils 92# Determine whether to use binutils
89.if ${OPSYS} == "SunOS" 93.if ${OPSYS} == "SunOS"
90. if exists(/usr/sfw/bin/gobjdump) 94. if exists(/usr/sfw/bin/gobjdump)
91CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump 95CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
92. endif 96. endif