From owner-svn-ports-all@FreeBSD.ORG Fri Feb 27 07:39:44 2015 Return-Path: Delivered-To: svn-ports-all@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 9161B87B; Fri, 27 Feb 2015 07:39:44 +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 623A6FF8; Fri, 27 Feb 2015 07:39:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1R7dikw016316; Fri, 27 Feb 2015 07:39:44 GMT (envelope-from vd@FreeBSD.org) Received: (from vd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1R7diuj016315; Fri, 27 Feb 2015 07:39:44 GMT (envelope-from vd@FreeBSD.org) Message-Id: <201502270739.t1R7diuj016315@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: vd set sender to vd@FreeBSD.org using -f From: Vasil Dimov Date: Fri, 27 Feb 2015 07:39:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380067 - head/graphics/hugin X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Feb 2015 07:39:44 -0000 Author: vd Date: Fri Feb 27 07:39:43 2015 New Revision: 380067 URL: https://svnweb.freebsd.org/changeset/ports/380067 QAT: https://qat.redports.org/buildarchive/r380067/ Log: Try to use the same compiler as graphics/OpenEXR PR: 197898 Modified: head/graphics/hugin/Makefile Modified: head/graphics/hugin/Makefile ============================================================================== --- head/graphics/hugin/Makefile Fri Feb 27 07:25:53 2015 (r380066) +++ head/graphics/hugin/Makefile Fri Feb 27 07:39:43 2015 (r380067) @@ -32,7 +32,7 @@ PANOMATIC_DESC= Install graphics/panomat AUTOPANOSIFTC_DESC= Install graphics/autopano-sift-c USES= cmake gettext pkgconfig tar:bzip2 desktop-file-utils python \ - shared-mime-info + shared-mime-info compiler:features CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} @@ -43,6 +43,15 @@ USE_GL= glew glut INSTALLS_ICONS= yes +.include + +# If default compiler is GCC, upgrade it because +# g++ 4.2 is too old. Basically, use the same compiler as graphics/OpenEXR +# see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197898 +.if ${COMPILER_TYPE} == gcc +USE_GCC= yes +.endif + # work around a bug in cmake (?). Without this we get an error like: # cd /usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/hugin1/base_wx && /usr/bin/c++ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -D_THREAD_SAFE -O2 -fno-strict-aliasing -pipe -pthread;-D_THREAD_SAFE -O3 -DNDEBUG -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/hugin_base -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/foreign -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/foreign/vigra -I/usr/local/include -I/usr/local/include/OpenEXR -isystem /usr/local/lib/wx/include/gtk2-ansi-release-2.8 -isystem /usr/local/include/wx-2.8 -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/hugin1 -o CMakeFiles/huginbasewx.dir/ImageCache.o -c /usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/hugin1/base_wx/ImageCache.cpp # c++: No input files specified @@ -72,4 +81,4 @@ RUN_DEPENDS+= panomatic:${PORTSDIR}/grap RUN_DEPENDS+= autopano:${PORTSDIR}/graphics/autopano-sift-c .endif -.include +.include