Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Jan 2017 08:55:57 +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: r430446 - head/cad/openvsp
Message-ID:  <201701030855.v038tvF2088170@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Jan  3 08:55:56 2017
New Revision: 430446
URL: https://svnweb.freebsd.org/changeset/ports/430446

Log:
  cad/openvsp: drop 10.1 workaround (revert r428665) per EOL
  
  PR:		214863 215307
  Approved by:	portmgr blanket

Modified:
  head/cad/openvsp/Makefile   (contents, props changed)

Modified: head/cad/openvsp/Makefile
==============================================================================
--- head/cad/openvsp/Makefile	Tue Jan  3 08:44:59 2017	(r430445)
+++ head/cad/openvsp/Makefile	Tue Jan  3 08:55:56 2017	(r430446)
@@ -37,19 +37,7 @@ WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_PR
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/SuperProject
 CMAKE_INSTALL_PREFIX=	${STAGEDIR}${PREFIX}
-USES=		cmake:outsource jpeg
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 && ${OSVERSION} < 1002000
-# Fails to build with GCC 4.9 in 10.1
-USE_GCC=	4.8
-LDFLAGS+=	-L${LOCALBASE}/lib/c++
-CXXFLAGS+=	-nostdinc++ -isystem ${LOCALBASE}/include/c++/v1
-BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
-.else
-USES +=		compiler:gcc-c++11-lib
-.endif
+USES=		cmake:outsource compiler:gcc-c++11-lib jpeg
 
 CMAKE_ARGS=	-DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \



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