Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id BECDA7A111 for ; Wed, 28 Sep 2016 14:39:02 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 3343285EC0; Wed, 28 Sep 2016 14:39:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B52F485EAD for ; Wed, 28 Sep 2016 14:39:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 1tuyY4FaHVlz for ; Wed, 28 Sep 2016 14:39:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0386D85E8F for ; Wed, 28 Sep 2016 14:39:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F2424FBD2; Wed, 28 Sep 2016 14:39:00 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1475073540204590" MIME-Version: 1.0 Date: Wed, 28 Sep 2016 14:39:00 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/lang To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20160928143900.F2424FBD2@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1475073540204590 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Wed Sep 28 14:39:00 UTC 2016 Modified Files: pkgsrc/lang/gcc5: distinfo pkgsrc/lang/gcc5/patches: patch-gcc_config.gcc pkgsrc/lang/gcc6: distinfo pkgsrc/lang/gcc6/patches: patch-gcc_config.gcc Log Message: lang/gcc{5,6}: avoid overwriting previous extra_objs in gcc/config.gcc No change for i386/amd64, but arm needs additional extra_objs to build. Mistake was in a netbsd-specific part of configure as well. Thanks to Richard Earnshaw and ktkachov at GCC for finding the problem. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/gcc5/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc5/patches/patch-gcc_config.gcc cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc6/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc6/patches/patch-gcc_config.gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1475073540204590 Content-Disposition: inline Content-Length: 4462 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/gcc5/distinfo diff -u pkgsrc/lang/gcc5/distinfo:1.11 pkgsrc/lang/gcc5/distinfo:1.12 --- pkgsrc/lang/gcc5/distinfo:1.11 Tue Sep 6 05:08:48 2016 +++ pkgsrc/lang/gcc5/distinfo Wed Sep 28 14:39:00 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2016/09/06 05:08:48 maya Exp $ +$NetBSD: distinfo,v 1.12 2016/09/28 14:39:00 maya Exp $ SHA1 (gcc-5.4.0.tar.bz2) = 07524df2b4ab9070bad9c49ab668da72237b8115 RMD160 (gcc-5.4.0.tar.bz2) = 7ae3413ca7e90bb21e65e637c02ddf2b675b45f4 @@ -9,7 +9,7 @@ RMD160 (isl-0.14.tar.bz2) = 4c69d026b515 SHA512 (isl-0.14.tar.bz2) = 117c0c6f31d91a9284a8f54a748df6494ca2ac21507a45611e911403e9610579b9323ce624aea1de0b8089b3194e59d4364f01bdb71ddcf8f6c24c749d11c4b7 Size (isl-0.14.tar.bz2) = 1399896 bytes SHA1 (patch-gcc_Makefile.in) = b2bceb34537de1cf704f18a59aa4e4d4a4551c62 -SHA1 (patch-gcc_config.gcc) = bfa3897de6afa573ee44a60973611c4e9024f497 +SHA1 (patch-gcc_config.gcc) = 84fedf863c853c40bf81884f5db3617200f0d31d SHA1 (patch-gcc_config.host) = 1b1e11cd199eb93f49443d51c0063b09b7327858 SHA1 (patch-gcc_config_host-netbsd.c) = 765295f07edb8a68f1910e3a9b4dd2a7dcd491a5 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633 Index: pkgsrc/lang/gcc5/patches/patch-gcc_config.gcc diff -u pkgsrc/lang/gcc5/patches/patch-gcc_config.gcc:1.1 pkgsrc/lang/gcc5/patches/patch-gcc_config.gcc:1.2 --- pkgsrc/lang/gcc5/patches/patch-gcc_config.gcc:1.1 Thu Jul 16 12:03:36 2015 +++ pkgsrc/lang/gcc5/patches/patch-gcc_config.gcc Wed Sep 28 14:39:00 2016 @@ -1,4 +1,4 @@ -$NetBSD: patch-gcc_config.gcc,v 1.1 2015/07/16 12:03:36 ryoon Exp $ +$NetBSD: patch-gcc_config.gcc,v 1.2 2016/09/28 14:39:00 maya Exp $ --- gcc/config.gcc.orig 2014-11-21 16:04:20.000000000 +0000 +++ gcc/config.gcc @@ -14,8 +14,8 @@ $NetBSD: patch-gcc_config.gcc,v 1.1 2015 + # cabs/cabsf are renamed to __c99_cabs/cabsf + tm_p_file="${tm_p_file} netbsd-protos.h" -+ target_gtfiles="\$(srcdir)/config/netbsd.c" -+ extra_objs="netbsd.o" ++ target_gtfiles="${target_gtfiles} \$(srcdir)/config/netbsd.c" ++ extra_objs="${extra_objs} netbsd.o" + # NetBSD 2.0 and later get POSIX threads enabled by default. # Allow them to be explicitly enabled on any other version. Index: pkgsrc/lang/gcc6/distinfo diff -u pkgsrc/lang/gcc6/distinfo:1.1 pkgsrc/lang/gcc6/distinfo:1.2 --- pkgsrc/lang/gcc6/distinfo:1.1 Mon Sep 12 22:13:54 2016 +++ pkgsrc/lang/gcc6/distinfo Wed Sep 28 14:39:00 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2016/09/12 22:13:54 maya Exp $ +$NetBSD: distinfo,v 1.2 2016/09/28 14:39:00 maya Exp $ SHA1 (gcc-6.2.0.tar.bz2) = 583e29c7fe69d9a1031a89752c2551ab5aeacb91 RMD160 (gcc-6.2.0.tar.bz2) = d9154ca51f40ae3ce42950a0476f701a9f86fc95 @@ -9,7 +9,7 @@ RMD160 (isl-0.14.tar.bz2) = 4c69d026b515 SHA512 (isl-0.14.tar.bz2) = 117c0c6f31d91a9284a8f54a748df6494ca2ac21507a45611e911403e9610579b9323ce624aea1de0b8089b3194e59d4364f01bdb71ddcf8f6c24c749d11c4b7 Size (isl-0.14.tar.bz2) = 1399896 bytes SHA1 (patch-gcc_Makefile.in) = ce366a091960d335ecb022918e2f7bfc4e3fcccf -SHA1 (patch-gcc_config.gcc) = bfa3897de6afa573ee44a60973611c4e9024f497 +SHA1 (patch-gcc_config.gcc) = f9591af10239ffdbe54721710533ce2df07c6c89 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550 SHA1 (patch-gcc_config_netbsd.c) = 3c09521e1803633a3643cf396a03f1f433ec869b Index: pkgsrc/lang/gcc6/patches/patch-gcc_config.gcc diff -u pkgsrc/lang/gcc6/patches/patch-gcc_config.gcc:1.1 pkgsrc/lang/gcc6/patches/patch-gcc_config.gcc:1.2 --- pkgsrc/lang/gcc6/patches/patch-gcc_config.gcc:1.1 Mon Sep 12 22:13:54 2016 +++ pkgsrc/lang/gcc6/patches/patch-gcc_config.gcc Wed Sep 28 14:39:00 2016 @@ -1,4 +1,4 @@ -$NetBSD: patch-gcc_config.gcc,v 1.1 2016/09/12 22:13:54 maya Exp $ +$NetBSD: patch-gcc_config.gcc,v 1.2 2016/09/28 14:39:00 maya Exp $ --- gcc/config.gcc.orig 2014-11-21 16:04:20.000000000 +0000 +++ gcc/config.gcc @@ -14,8 +14,8 @@ $NetBSD: patch-gcc_config.gcc,v 1.1 2016 + # cabs/cabsf are renamed to __c99_cabs/cabsf + tm_p_file="${tm_p_file} netbsd-protos.h" -+ target_gtfiles="\$(srcdir)/config/netbsd.c" -+ extra_objs="netbsd.o" ++ target_gtfiles="${extra_gtfiles} \$(srcdir)/config/netbsd.c" ++ extra_objs="${extra_objs} netbsd.o" + # NetBSD 2.0 and later get POSIX threads enabled by default. # Allow them to be explicitly enabled on any other version. --_----------=_1475073540204590--