svn commit: r484471 - in head: devel/simgear games/flightgear

[Ganael LAPLANCHE]

Author: martymac
Date: Thu Nov  8 19:29:14 2018
New Revision: 484471
URL: https://svnweb.freebsd.org/changeset/ports/484471

Log:
  devel/simgear: GCC architectures require linking with libosgDB [1]
  
  Also, remove support for Clang < 4.0 and GCC < 6 for devel/simgear [1] and
  games/flightgear ports.
  
  PR:		232832 [1]
  Submitted by:	Piotr Kubaj <pkubaj at anongoth.pl> [1]

Modified:
  head/devel/simgear/Makefile
  head/games/flightgear/Makefile

Modified: head/devel/simgear/Makefile
==============================================================================
--- head/devel/simgear/Makefile	Thu Nov  8 19:16:26 2018	(r484470)
+++ head/devel/simgear/Makefile	Thu Nov  8 19:29:14 2018	(r484471)
@@ -21,20 +21,11 @@ USES=		alias cmake compiler:c++11-lib cpe gl jpeg open
 USE_XORG=	ice sm x11 xext xi xmu xt
 USE_GL=		gl glu glut
 
-.include <bsd.port.pre.mk>
+LDFLAGS_mips=	-losgDB
+LDFLAGS_mips64=	-losgDB
+LDFLAGS_powerpc64=	-losgDB
+LDFLAGS_powerpc=	-losgDB
+LDFLAGS_powerpcspe=	-losgDB
+LDFLAGS_sparc64=	-losgDB
 
-# Needs Clang 4.0+ to build, see:
-# https://sourceforge.net/p/flightgear/codetickets/2015/
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 40
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang40:devel/llvm40
-CPP=	${LOCALBASE}/bin/clang-cpp40
-CC=	${LOCALBASE}/bin/clang40
-CXX=	${LOCALBASE}/bin/clang++40
-.endif
-
-# Work around "'to_string' is not a member of 'std'" when building with Gcc < 6
-.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 60
-CFLAGS+=	-D_GLIBCXX_USE_C99
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/games/flightgear/Makefile
==============================================================================
--- head/games/flightgear/Makefile	Thu Nov  8 19:16:26 2018	(r484470)
+++ head/games/flightgear/Makefile	Thu Nov  8 19:29:14 2018	(r484471)
@@ -51,21 +51,4 @@ QT5_CMAKE_OFF=	-DENABLE_QT:BOOL=OFF
 QT5_USES=	qt:5
 QT5_USE=	QT=core,buildtools,gui,declarative,network,qmake,widgets
 
-.include <bsd.port.pre.mk>
-
-# Needs Clang 4.0+ to build, see:
-# https://sourceforge.net/p/flightgear/codetickets/2015/
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 40
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang40:devel/llvm40
-CPP=	${LOCALBASE}/bin/clang-cpp40
-CC=	${LOCALBASE}/bin/clang40
-CXX=	${LOCALBASE}/bin/clang++40
-.endif
-
-# Chase devel/simgear compiler version
-.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46
-USE_GCC=	yes
-CXXFLAGS+=	-D_GLIBCXX_USE_C99
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>