From f74845bc3a12d38c180ec6e1bf26f291d58d37f7 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 4 Mar 2019 10:35:34 +0000 Subject: [PATCH] math/gap: unbreak with libc++ 8 In file included from src/bistellar_move.cpp:9: In file included from src/bistellar_move.h:12: In file included from /usr/include/c++/v1/iostream:38: In file included from /usr/include/c++/v1/ios:216: In file included from /usr/include/c++/v1/__locale:15: In file included from /usr/include/c++/v1/string:505: In file included from /usr/include/c++/v1/string_view:176: In file included from /usr/include/c++/v1/__string:57: In file included from /usr/include/c++/v1/algorithm:640: In file included from /usr/include/c++/v1/initializer_list:47: In file included from /usr/include/c++/v1/cstddef:38: ./version:1:1: error: expected unqualified-id 2.1.7 ^ PR: 236192 Approved by: portmgr blanket --- math/gap/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/math/gap/Makefile b/math/gap/Makefile index 4fba7dd0f096..9c65d32b17e6 100644 --- a/math/gap/Makefile +++ b/math/gap/Makefile @@ -46,6 +46,9 @@ PLIST_FILES= bin/gap post-patch: @${REINPLACE_CMD} -i '' -e '1s|/usr/bin/sh|/bin/sh|' \ ${WRKSRC}/pkg/happrime/make_tarball +# Avoid conflict with C++20 by ignoring <...> under WRKSRC + @${REINPLACE_CMD} -i .c++20 's/-I/-iquote/' \ + ${WRKSRC}/pkg/*/Makefile.in post-build: cd ${WRKSRC}/pkg/simpcomp && \