From owner-svn-ports-all@freebsd.org Tue Jan 31 21:25:32 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A87ECCACF5; Tue, 31 Jan 2017 21:25:32 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5E6F1135; Tue, 31 Jan 2017 21:25:31 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0VLPVAK087356; Tue, 31 Jan 2017 21:25:31 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0VLPVVs087355; Tue, 31 Jan 2017 21:25:31 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201701312125.v0VLPVVs087355@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 31 Jan 2017 21:25:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432958 - head/lang/gcc5/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2017 21:25:32 -0000 Author: dim (src committer) Date: Tue Jan 31 21:25:30 2017 New Revision: 432958 URL: https://svnweb.freebsd.org/changeset/ports/432958 Log: Similar to bug 212465, lang/gcc5 doesn't compile with recent versions of libc++, because it attempts to redefine abort(): In file included from /wrkdirs/usr/ports/lang/gcc5/work/gcc-5.4.0/gcc/auto-profile.c:25: In file included from /usr/include/c++/v1/map:446: /usr/include/c++/v1/functional:1398:2: error: no member named 'fancy_abort' in namespace 'std::__1'; did you mean simply 'fancy_abort'? _VSTD::abort(); ^~~~~~~ /usr/include/c++/v1/__config:383:15: note: expanded from macro '_VSTD' #define _VSTD std::_LIBCPP_NAMESPACE ^ Patch this in the same way as the other gcc ports, by including in gcc/system.h, and moving a few includes to before "system.h". Approved by: gerald (maintainer) PR: 216266 MFH: 2017Q1 Added: head/lang/gcc5/files/patch-libc++ (contents, props changed) Added: head/lang/gcc5/files/patch-libc++ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/gcc5/files/patch-libc++ Tue Jan 31 21:25:30 2017 (r432958) @@ -0,0 +1,43 @@ +--- gcc/auto-profile.c.orig 2015-01-18 02:25:42 UTC ++++ gcc/auto-profile.c +@@ -19,11 +19,9 @@ along with GCC; see the file COPYING3. + . */ + + #include "config.h" +-#include "system.h" +- +-#include + #include + #include ++#include "system.h" + + #include "coretypes.h" + #include "hash-set.h" +--- gcc/graphite-isl-ast-to-gimple.c.orig 2017-01-19 21:02:12 UTC ++++ gcc/graphite-isl-ast-to-gimple.c +@@ -38,6 +38,7 @@ extern "C" { + #endif + #endif + ++#include + #include "system.h" + #include "coretypes.h" + #include "hash-set.h" +@@ -75,7 +76,6 @@ extern "C" { + #include "tree-scalar-evolution.h" + #include "gimple-ssa.h" + #include "tree-into-ssa.h" +-#include + + #ifdef HAVE_isl + #include "graphite-poly.h" +--- gcc/system.h.orig 2015-01-05 12:33:28 UTC ++++ gcc/system.h +@@ -217,6 +217,7 @@ extern int errno; + #ifdef __cplusplus + # include + # include ++# include + # include + #endif +