Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Mar 2019 08:21:36 +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: r494783 - head/games/flightgear
Message-ID:  <201903060821.x268LaHL088373@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Mar  6 08:21:36 2019
New Revision: 494783
URL: https://svnweb.freebsd.org/changeset/ports/494783

Log:
  games/flightgear: unbreak with libc++ 8
  
  In file included from utils/fgelev/fgelev.cxx:23:
  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
  2018.3.2
  ^
  
  PR:		236192
  Reported by:	pkg-fallout
  Approved by:	portmgr blanket

Modified:
  head/games/flightgear/Makefile   (contents, props changed)

Modified: head/games/flightgear/Makefile
==============================================================================
--- head/games/flightgear/Makefile	Wed Mar  6 08:21:29 2019	(r494782)
+++ head/games/flightgear/Makefile	Wed Mar  6 08:21:36 2019	(r494783)
@@ -52,4 +52,10 @@ QT5_CMAKE_OFF=	-DENABLE_QT:BOOL=OFF
 QT5_USES=	qt:5
 QT5_USE=	QT=core,buildtools,gui,declarative,network,qmake,widgets,svg
 
+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?201903060821.x268LaHL088373>