From 33f56e8bd5538278be82da44f39af340a885cca6 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 14 Mar 2012 23:24:54 +0000 Subject: 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. --- lang/gcc46/Makefile | 13 ++++++------- lang/gcc46/distinfo | 4 ++-- lang/gcc46/patches/patch-aa | 13 +++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'lang/gcc46') 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} \ diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo index 8114bab86b1..ab91ec9498c 100644 --- a/lang/gcc46/distinfo +++ b/lang/gcc46/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.6 2012/03/05 15:25:36 wiz Exp $ +$NetBSD: distinfo,v 1.7 2012/03/14 23:24:54 wiz Exp $ SHA1 (gcc-4.6.3.tar.bz2) = ce317ca5c8185b58bc9300182b534608c578637f RMD160 (gcc-4.6.3.tar.bz2) = 9abb2f940d08fc84f2d91b6a6ce8d662ca889269 Size (gcc-4.6.3.tar.bz2) = 71999439 bytes -SHA1 (patch-aa) = 801b340bb24586c84b09f53161a7aced141ab9d9 +SHA1 (patch-aa) = f125edd8d8acd9751e137db9a8e3aad712dd5ddc SHA1 (patch-ab) = f69d2db611aee1d31b7872bbf59d2b651413b3d3 SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee SHA1 (patch-ad) = cd560eba165fe0c8d43a336d6674bdc95cd00fb1 diff --git a/lang/gcc46/patches/patch-aa b/lang/gcc46/patches/patch-aa index 580ccf0be4b..2f83612cb6d 100644 --- a/lang/gcc46/patches/patch-aa +++ b/lang/gcc46/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2011/05/15 00:09:56 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2012/03/14 23:24:54 wiz Exp $ ---- gcc/config.gcc.orig 2011-03-14 06:05:29.000000000 +0000 -+++ gcc/config.gcc -@@ -560,6 +560,33 @@ case ${target} in +--- gcc/config.gcc.orig 2011-07-22 18:44:50.000000000 +0200 ++++ gcc/config.gcc 2012-03-13 13:40:05.000000000 +0100 +@@ -561,6 +561,33 @@ # need_64bit_hwint=yes # system compiler has this for all arch! use_gcc_stdint=wrap ;; @@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2011/05/15 00:09:56 wiz Exp $ *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu) extra_options="$extra_options gnu-user.opt" extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o" -@@ -654,6 +681,7 @@ case ${target} in +@@ -655,6 +682,7 @@ default_use_cxa_atexit=yes ;; esac @@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2011/05/15 00:09:56 wiz Exp $ ;; *-*-openbsd*) tmake_file="t-libc-ok t-openbsd t-libgcc-pic" -@@ -1217,19 +1245,25 @@ x86_64-*-freebsd*) +@@ -1219,19 +1247,26 @@ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h" tmake_file="${tmake_file} i386/t-crtstuff" ;; @@ -58,6 +58,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2011/05/15 00:09:56 wiz Exp $ - tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h" + tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h netbsd-stdint.h" extra_options="${extra_options} netbsd.opt netbsd-elf.opt" ++ tmake_file="${tmake_file} i386/t-crtstuff" ;; i[34567]86-*-netbsd*) - tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h netbsd.h netbsd-aout.h i386/netbsd.h" -- cgit v1.2.3