Date: Fri, 27 Feb 2015 07:39:44 +0000 (UTC) From: Vasil Dimov <vd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380067 - head/graphics/hugin Message-ID: <201502270739.t1R7diuj016315@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk> + +# 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 <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502270739.t1R7diuj016315>