From 1834d7815d4b6edf46a8e26630cd293b074b0483 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 13 Aug 2011 14:06:22 +0000 Subject: Update to 4.6.1, provided by Kai-Uwe Eckhardt. Do not depend on libelf and binutils on Linux since the current pkgsrc versions might effectively be downgrades and break stuff (this needs a better solution, like e.g. updating them :) ). Changes: 158 bugs fixed, see http://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=4.6.1 --- lang/gcc46/Makefile | 9 +++++---- lang/gcc46/distinfo | 10 +++++----- lang/gcc46/patches/patch-al | 10 +++++----- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index ff141db1288..f28e348cd49 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/05/15 00:09:55 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2011/08/13 14:06:22 wiz Exp $ DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc46-${GCC_VERSION} @@ -20,7 +20,7 @@ USE_TOOLS+= awk:run bash:run perl chmod \ DEPENDS+= zip-[0-9]*:../../archivers/zip DEPENDS+= libiconv-[0-9]*:../../converters/libiconv -GCC_VERSION= 4.6.0 +GCC_VERSION= 4.6.1 GCC_SUBPREFIX= gcc46 GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} @@ -113,6 +113,9 @@ MAKE_ENV+= ac_cv_func_clock_gettime=yes .endif .if ${OPSYS} == "Linux" CONFIGURE_ARGS+= --disable-libquadmath --disable-libquadmath-support +.else +.include "../../devel/binutils/buildlink3.mk" +.include "../../devel/libelf/buildlink3.mk" .endif CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL} @@ -192,7 +195,5 @@ GENERATE_PLIST+= \ .include "../../math/mpcomplex/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../math/mpfr/buildlink3.mk" -.include "../../devel/binutils/buildlink3.mk" -.include "../../devel/libelf/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo index 06dc28aa32c..e055a3f527a 100644 --- a/lang/gcc46/distinfo +++ b/lang/gcc46/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2011/05/15 00:09:56 wiz Exp $ +$NetBSD: distinfo,v 1.2 2011/08/13 14:06:22 wiz Exp $ -SHA1 (gcc-4.6.0.tar.bz2) = dcbb5ce724c4bf87b9ec93473d16b71e9ebac483 -RMD160 (gcc-4.6.0.tar.bz2) = b4069838c882d70320a54c25517fa84ba2e7db8d -Size (gcc-4.6.0.tar.bz2) = 71579535 bytes +SHA1 (gcc-4.6.1.tar.bz2) = 8bf66f7a71534ba564563a0ba0b2517aead8ac30 +RMD160 (gcc-4.6.1.tar.bz2) = e12a50dc951b02c62916acfbb181c00cae176fd0 +Size (gcc-4.6.1.tar.bz2) = 71688404 bytes SHA1 (patch-aa) = 801b340bb24586c84b09f53161a7aced141ab9d9 SHA1 (patch-ab) = f69d2db611aee1d31b7872bbf59d2b651413b3d3 SHA1 (patch-ad) = 42894f37b20f85e601b941a8fea99d2af3f8b6c7 @@ -10,4 +10,4 @@ SHA1 (patch-af) = fb06bce10adc88d3f6829f41a91f4612a72434fd SHA1 (patch-ag) = 4b82b06880bdccc3f967c8633e957fef4509dbc1 SHA1 (patch-ah) = 7bddb8424dfcbce3e0cf1d856f851d827b66303c SHA1 (patch-ak) = 3038525af107b6c5ecf91ecb4aa8120c9881fe29 -SHA1 (patch-al) = 96b2a39c91af219227b202f1c3ce182f3bbdf502 +SHA1 (patch-al) = affbda7c7e7385425685a905377d7715debd7459 diff --git a/lang/gcc46/patches/patch-al b/lang/gcc46/patches/patch-al index 25a8ca3ac8b..38ae443de3f 100644 --- a/lang/gcc46/patches/patch-al +++ b/lang/gcc46/patches/patch-al @@ -1,13 +1,13 @@ -$NetBSD: patch-al,v 1.1.1.1 2011/05/15 00:09:56 wiz Exp $ +$NetBSD: patch-al,v 1.2 2011/08/13 14:06:22 wiz Exp $ ---- libgfortran/configure.orig 2011-04-13 10:23:06.659661693 +0000 +--- libgfortran/configure.orig 2011-06-27 10:13:01.000000000 +0000 +++ libgfortran/configure -@@ -25687,7 +25687,7 @@ $as_echo "#define SUPPORTS_WEAK 1" >>con +@@ -25699,7 +25699,7 @@ $as_echo "#define SUPPORTS_WEAK 1" >>con fi case "$host" in -- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* ) -+ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-netbsd*) +- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | alpha*-dec-osf* ) ++ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | alpha*-dec-osf* | *-*-netbsd* ) $as_echo "#define GTHREAD_USE_WEAK 0" >>confdefs.h -- cgit v1.2.3