Date: Thu, 13 Mar 2014 18:59:50 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348117 - head/graphics/enblend Message-ID: <201403131859.s2DIxoH1037488@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Thu Mar 13 18:59:49 2014 New Revision: 348117 URL: http://svnweb.freebsd.org/changeset/ports/348117 QAT: https://qat.redports.org/buildarchive/r348117/ Log: Fix build on FreeBSD 10+, and do not force USE_GCC there (which causes vigra linker issues). If the default compiler is gcc, however, we still request the ports default gcc. Modified: head/graphics/enblend/Makefile Modified: head/graphics/enblend/Makefile ============================================================================== --- head/graphics/enblend/Makefile Thu Mar 13 18:49:27 2014 (r348116) +++ head/graphics/enblend/Makefile Thu Mar 13 18:59:49 2014 (r348117) @@ -23,14 +23,11 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap RUN_DEPENDS= OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR USE_AUTOTOOLS= automake:env autoconf:env -USES= gmake +USES= gmake compiler:features # We need a newer version of makeinfo for this. # Remove this line when we remove texinfo from the base system. CONFIGURE_ARGS= MAKEINFO="${LOCALBASE}/bin/makeinfo" -# GCC 4.2 has some problems, see -# http://groups.google.com/group/hugin-ptx/browse_thread/thread/725b1581c9889e37/50abe3387d61541a#50abe3387d61541a -USE_GCC= yes USE_GL= glew glut GNU_CONFIGURE= yes CONFIGURE_ENV+= "LIBS=-lboost_system" @@ -38,10 +35,21 @@ CONFIGURE_ARGS+= --with-boost-filesystem CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +.include <bsd.port.pre.mk> + +.if ${COMPILER_TYPE} == gcc +# GCC 4.2 has some problems, see +# http://groups.google.com/group/hugin-ptx/browse_thread/thread/725b1581c9889e37/50abe3387d61541a#50abe3387d61541a +# Clang, on 10.0-RELEASE is fine. +USE_GCC= yes +.else +CXXFLAGS+= -Wno-c++11-extensions +.endif + INFO= enfuse enblend PLIST_FILES= bin/enblend bin/enfuse man/man1/enblend.1.gz man/man1/enfuse.1.gz post-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH} -.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?201403131859.s2DIxoH1037488>