svn commit: r432076 - head/lang/gcc7-devel/files
Dimitry Andric
dim at FreeBSD.org
Sat Jan 21 19:16:08 UTC 2017
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 <getopt.h>
+
+-#include <vector>
+-#include <algorithm>
+ #include "md5.h"
+
+ using namespace std;
More information about the svn-ports-all
mailing list