Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Mar 2019 10:35:34 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r494578 - head/math/gap
Message-ID:  <201903041035.x24AZYMD002467@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Mar  4 10:35:34 2019
New Revision: 494578
URL: https://svnweb.freebsd.org/changeset/ports/494578

Log:
  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

Modified:
  head/math/gap/Makefile   (contents, props changed)

Modified: head/math/gap/Makefile
==============================================================================
--- head/math/gap/Makefile	Mon Mar  4 10:14:06 2019	(r494577)
+++ head/math/gap/Makefile	Mon Mar  4 10:35:34 2019	(r494578)
@@ -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 <version> by ignoring <...> under WRKSRC
+	@${REINPLACE_CMD} -i .c++20 's/-I/-iquote/' \
+		${WRKSRC}/pkg/*/Makefile.in
 
 post-build:
 	cd ${WRKSRC}/pkg/simpcomp && \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903041035.x24AZYMD002467>