summaryrefslogtreecommitdiff
path: root/lang/gcc46/Makefile
diff options
context:
space:
mode:
authorwiz <wiz>2012-03-14 23:24:54 +0000
committerwiz <wiz>2012-03-14 23:24:54 +0000
commit5636e8737499555fc18b1afddf58f065ada5db56 (patch)
treef90056ee7f703bdd25cde413c042ca436deeb64c /lang/gcc46/Makefile
parent5086ee8048e23e65e8a5cda2347facabdb3c98b1 (diff)
downloadpkgsrc-5636e8737499555fc18b1afddf58f065ada5db56.tar.gz
Pass proper configure arguments so that it is happy with GNU tools available
on NetBSD; removes two dependencies. Unlimit before running tests, reduces test failures. Add t-crtstuff to tmake_file on NetBSD as well. gcc46 should work much better now on NetBSD. All from Kai-Uwe Eckhardt in private mail. Bump PKGREVISION.
Diffstat (limited to 'lang/gcc46/Makefile')
-rw-r--r--lang/gcc46/Makefile13
1 files changed, 6 insertions, 7 deletions
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index f2b1a243bef..9a4477f3ea3 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2012/03/05 15:25:36 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2012/03/14 23:24:54 wiz Exp $
DISTNAME= gcc-${GCC_VERSION}
PKGNAME= gcc46-${GCC_VERSION}
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
EXTRACT_SUFX= .tar.bz2
@@ -76,10 +77,8 @@ CONFIGURE_ARGS+= --enable-threads=posix
CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}
CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr}
.if ${OPSYS} == "NetBSD"
-.include "../../devel/binutils/buildlink3.mk"
-.include "../../devel/libelf/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ld=${PREFIX}/bin/gnu-ld
-CONFIGURE_ARGS+= --with-libelf=${PREFIX}
+CONFIGURE_ARGS+= --with-gnu-ld --with-ld=/usr/bin/ld
+CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/bin/as
MAKE_ENV+= ac_cv_func_clock_gettime=yes
.endif
.if ${OPSYS} == "Linux"
@@ -102,7 +101,7 @@ CPPFLAGS+= -I${BUILDLINK_DIR}/include
CFLAGS+= -I${BUILDLINK_DIR}/include
-# Somone should fix this so it will match the NetBSD system compiler
+# Someone should fix this so it will match the NetBSD system compiler
#.if ${OPSYS} == "NetBSD"
#GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}
#CONFIGURE_ARGS+= --host=${GCC_PLATFORM:Q}
@@ -134,7 +133,7 @@ do-test:
#.if (${MACHINE_GNU_ARCH} == "x86_64")
# (cd ${FILESDIR} && ${CP} netbsd64macro.dfs ${WRKSRC}/gcc/testsuite/ada/acats/support/macro.dfs)
#.endif
- (cd ${WRKDIR}/obj && ${GMAKE} -k check)
+ (${_ULIMIT_CMD} cd ${WRKDIR}/obj && ${GMAKE} -k check)
do-install:
(cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} install DESTDIR=${DESTDIR} \