Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Dec 2016 09:24:32 +0000 (UTC)
From:      Torsten Zuehlsdorff <tz@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r428665 - head/cad/openvsp
Message-ID:  <201612160924.uBG9OWhl005721@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tz
Date: Fri Dec 16 09:24:32 2016
New Revision: 428665
URL: https://svnweb.freebsd.org/changeset/ports/428665

Log:
  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

Modified:
  head/cad/openvsp/Makefile

Modified: head/cad/openvsp/Makefile
==============================================================================
--- head/cad/openvsp/Makefile	Fri Dec 16 09:21:24 2016	(r428664)
+++ head/cad/openvsp/Makefile	Fri Dec 16 09:24:32 2016	(r428665)
@@ -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_PR
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/SuperProject
 CMAKE_INSTALL_PREFIX=	${STAGEDIR}${PREFIX}
-USES=		cmake:outsource compiler:gcc-c++11-lib jpeg
+USES=		cmake:outsource jpeg
+
+.include <bsd.port.options.mk>
+
+.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 \



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