From owner-svn-ports-head@FreeBSD.ORG Sat Feb 28 11:56:26 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 112C9EC7; Sat, 28 Feb 2015 11:56:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F0B39B85; Sat, 28 Feb 2015 11:56:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1SBuP3B024382; Sat, 28 Feb 2015 11:56:25 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1SBuPl7024381; Sat, 28 Feb 2015 11:56:25 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201502281156.t1SBuPl7024381@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Sat, 28 Feb 2015 11:56:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380135 - head/graphics/openimageio X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Feb 2015 11:56:26 -0000 Author: gerald Date: Sat Feb 28 11:56:24 2015 New Revision: 380135 URL: https://svnweb.freebsd.org/changeset/ports/380135 QAT: https://qat.redports.org/buildarchive/r380135/ Log: If building with GCC, force the use of a current version, since some dependencies do that now and the old GCC 4.2 system compiler fails to link with those. PR: 197907, 196712 Submitted by: FreeBSD@ShaneWare.Biz (maintainer) Modified: head/graphics/openimageio/Makefile Modified: head/graphics/openimageio/Makefile ============================================================================== --- head/graphics/openimageio/Makefile Sat Feb 28 11:16:33 2015 (r380134) +++ head/graphics/openimageio/Makefile Sat Feb 28 11:56:24 2015 (r380135) @@ -20,7 +20,7 @@ GH_COMMIT= 99a9988 # fbm also installs bin/idiff CONFLICTS= fbm-[0-9]* -USES= cmake:outsource +USES= cmake:outsource compiler CMAKE_ARGS= -DBUILDSTATIC:BOOL=OFF \ -DLINKSTATIC:BOOL=OFF \ -DNOTHREADS:BOOL=OFF \ @@ -71,6 +71,13 @@ CMAKE_ENV+= QTDIR=${QT_PREFIX} QT_INCLUD CMAKE_ARGS+= -DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF .endif +.include + +.if ${COMPILER_TYPE} == gcc +# GCC 4.2 does not link with other ports that now use GCC 4.9 or later. +USE_GCC= yes +.endif + post-patch: @${REINPLACE_CMD} -e 's|share/doc/OpenImageIO|${DOCSDIR}|g' \ ${WRKSRC}/CMakeLists.txt @@ -81,4 +88,4 @@ post-install: ${LN} -sf libOpenImageIO_Util.so.1.4 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1 .endif -.include +.include