1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00

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 <new> in
gcc/system.h, and moving a few includes to before "system.h".

Approved by:	gerald (maintainer)
PR:		216266
MFH:		2017Q1
This commit is contained in:
Dimitry Andric 2017-01-31 21:25:30 +00:00
parent 20310cb0fc
commit 54e90b862c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=432958

View File

@ -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.
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#include "system.h"
-
-#include <string.h>
#include <map>
#include <set>
+#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 <map>
#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 <map>
#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 <algorithm>
# include <cstring>
+# include <new>
# include <utility>
#endif