Date: Wed, 13 Mar 2013 13:53:30 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314085 - head/graphics/vigra Message-ID: <201303131353.r2DDrUWU044528@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Wed Mar 13 13:53:29 2013 New Revision: 314085 URL: http://svnweb.freebsd.org/changeset/ports/314085 Log: - Depend on GCC4.6+ only when Python/NumPy option selected (due to Fortran use in NumPy) - By defaults NumPy option is off - Bump PORTREVISION to force rebuild with main ports compiler Requested by: amdmi3, jkim Modified: head/graphics/vigra/Makefile Modified: head/graphics/vigra/Makefile ============================================================================== --- head/graphics/vigra/Makefile Wed Mar 13 13:45:36 2013 (r314084) +++ head/graphics/vigra/Makefile Wed Mar 13 13:53:29 2013 (r314085) @@ -3,7 +3,7 @@ PORTNAME= vigra PORTVERSION= 1.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -21,8 +21,9 @@ CMAKE_ARGS= -DDEPENDENCY_SEARCH_PREFIX:P USE_LDCONFIG= yes -OPTIONS_DEFINE= HDF5 OPENEXR PYTHON +OPTIONS_DEFINE= HDF5 OPENEXR NUMPY OPTIONS_DEFAULT= HDF5 OPENEXR +NUMPY_DESC= NumPy mathematical computing (USE Fortran/GCC46+) .include <bsd.port.options.mk> @@ -40,9 +41,11 @@ LIB_DEPENDS+= IlmImf:${PORTSDIR}/graphic CMAKE_ARGS+= -DWITH_OPENEXR=0 .endif -.if ${PORT_OPTIONS:MPYTHON} +.if ${PORT_OPTIONS:MNUMPY} CONFLICTS_BUILD= python3* CMAKE_ARGS+= -DWITH_VIGRANUMPY=1 +USE_GCC= 4.6+ +USE_FORTRAN= yes USE_PYTHON= 2.6-2.7 BUILD_DEPENDS+= nosetests:${PORTSDIR}/devel/py-nose BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy @@ -57,12 +60,6 @@ PLIST_SUB+= PYTHON="@comment " .include <bsd.port.pre.mk> -# Check for clang, else use gcc46+ -CPP_check!= ${CPP} --version | tr -d '()' -.if !${CPP_check:Mclang} -USE_GCC= 4.6+ -.endif - # Vigra's CMakeLists.txt does not support disabling those so we hook them # as dependencies here unconditionally (without OPTIONS=) even though if # they are not present then Vigra/CMake will do without them (they are not @@ -91,6 +88,15 @@ LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fft LIB_DEPENDS+= fftw3f:${PORTSDIR}/math/fftw3-float .endif +pre-everything:: +.if ${PORT_OPTIONS:MNUMPY} + @${ECHO} "" + @${ECHO} "* BEWARE!" + @${ECHO} "* Using py-NumPY implies Fortran and GCC4.6+ as hard dependencies" + @${ECHO} "* and require to all ports, depended on vigra, set USE_GCC=4.6+" + @${ECHO} "" +.endif + post-patch: # FIXME: This is ugly @${RM} ${WRKSRC}/include/vigra/*.orig
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303131353.r2DDrUWU044528>