From owner-svn-ports-head@freebsd.org Sat Jan 21 19:16:07 2017 Return-Path: Delivered-To: svn-ports-head@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 E48DACBB84F; Sat, 21 Jan 2017 19:16:07 +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 B424D7D4; Sat, 21 Jan 2017 19:16:07 +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 v0LJG68X089544; Sat, 21 Jan 2017 19:16:06 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0LJG6mY089543; Sat, 21 Jan 2017 19:16:06 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201701211916.v0LJG6mY089543@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 21 Jan 2017 19:16:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432076 - head/lang/gcc7-devel/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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jan 2017 19:16:08 -0000 Author: dim (src committer) Date: Sat Jan 21 19:16:06 2017 New Revision: 432076 URL: https://svnweb.freebsd.org/changeset/ports/432076 Log: Fix system includes in lang/gcc7-devel Similar to bug 212465 and bug 216266, lang/gcc7-devel doesn't compile with libc++ 4.0.0, due to clashes between the redefined abort macro and standard C++ headers. Upstream seems to have realized this issue, and are now using system.h to pull in C++ standard headers, when INCLUDE_xxx is defined, where xxx is ALGORITHM, VECTOR, and so on. In this case only gcov.c needs to be fixed. Approved by: gerald (maintainer) PR: 216303 MFH: 2017Q1 Added: head/lang/gcc7-devel/files/patch-libc++ (contents, props changed) Added: head/lang/gcc7-devel/files/patch-libc++ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/gcc7-devel/files/patch-libc++ Sat Jan 21 19:16:06 2017 (r432076) @@ -0,0 +1,20 @@ +--- gcc/gcov.c.orig 2017-01-01 12:07:43 UTC ++++ gcc/gcov.c +@@ -31,6 +31,8 @@ along with Gcov; see the file COPYING3. + probabilities of fall through arcs. */ + + #include "config.h" ++#define INCLUDE_ALGORITHM ++#define INCLUDE_VECTOR + #include "system.h" + #include "coretypes.h" + #include "tm.h" +@@ -41,8 +43,6 @@ along with Gcov; see the file COPYING3. + + #include + +-#include +-#include + #include "md5.h" + + using namespace std;