From 30c8d12e7a85d2aa85b1e1faeceb00ad43badf07 Mon Sep 17 00:00:00 2001 From: tz Date: Fri, 16 Dec 2016 09:24:32 +0000 Subject: cad/openvsp: fix compilation in 10.1 The port broke on 10.1 since the update to gcc 4.9. Now we enforce gcc 4.8 on FreeBSD 10.1. PR: 215307 Submitted by: fernando.apesteguia@gmail.com (maintainer) Approved by: mentors (implict) MFH: 2016Q4 --- cad/openvsp/Makefile | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'cad') diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index 8828e14d4352..e0ff52af5a0e 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -4,7 +4,7 @@ PORTNAME= openvsp PORTVERSION= 3.9.1 DISTVERSIONPREFIX= ${GH_PROJECT}_ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MAINTAINER= fernando.apesteguia@gmail.com @@ -39,7 +39,20 @@ WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_PROJECT}_${PORTVERSION} CMAKE_SOURCE_PATH= ${WRKSRC}/SuperProject CMAKE_INSTALL_PREFIX= ${STAGEDIR}${PREFIX} -USES= cmake:outsource compiler:gcc-c++11-lib jpeg +USES= cmake:outsource jpeg + +.include + +.if ${OSVERSION} == 1001000 +# 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 + CMAKE_ARGS= -DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \ -DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \ -DVSP_USE_SYSTEM_LIBXML2:BOOLEAN=yes \ -- cgit