Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Mar 2019 07:06:48 +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: r494555 - head/devel/simgear
Message-ID:  <201903040706.x2476mQQ091086@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Mar  4 07:06:48 2019
New Revision: 494555
URL: https://svnweb.freebsd.org/changeset/ports/494555

Log:
  devel/simgear: unbreak with libc++ 8
  
  In file included from simgear/bucket/newbucket.cxx:30:
  In file included from /usr/include/c++/v1/cmath:305:
  In file included from /usr/include/c++/v1/math.h:309:
  In file included from /usr/include/c++/v1/type_traits:406:
  In file included from /usr/include/c++/v1/cstddef:38:
  version:1:1: error: expected unqualified-id
  2018.3.2
  ^
  
  PR:		236192
  Approved by:	portmgr blanket

Modified:
  head/devel/simgear/Makefile   (contents, props changed)

Modified: head/devel/simgear/Makefile
==============================================================================
--- head/devel/simgear/Makefile	Mon Mar  4 06:55:08 2019	(r494554)
+++ head/devel/simgear/Makefile	Mon Mar  4 07:06:48 2019	(r494555)
@@ -27,4 +27,10 @@ LDFLAGS_powerpc=	-losgDB
 LDFLAGS_powerpcspe=	-losgDB
 LDFLAGS_sparc64=	-losgDB
 
+post-patch:
+# Avoid conflict with C++20 <version> by adding .txt suffix
+	@${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
+	@${REINPLACE_CMD} -Ei .c++20 '/file|set_prop/s/version[[:>:]]/&.txt/' \
+		${WRKSRC}/CMakeLists.txt
+
 .include <bsd.port.mk>



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