svn commit: r335874 - head/graphics/opencv

Jason E. Hale jhale at FreeBSD.org
Sun Dec 8 10:55:58 UTC 2013


Author: jhale
Date: Sun Dec  8 10:55:57 2013
New Revision: 335874
URL: http://svnweb.freebsd.org/changeset/ports/335874

Log:
  - Move CFLAGS to python block.  They are causing build errors by picking
    up old headers if a previous version is installed and are not needed for
    the main build
  
  Reported by:	Andrzej Tobola <ato at iem.pw.edu.pl>, Kevin Oberman <rkoberman at gmail.com>

Modified:
  head/graphics/opencv/Makefile

Modified: head/graphics/opencv/Makefile
==============================================================================
--- head/graphics/opencv/Makefile	Sun Dec  8 09:55:41 2013	(r335873)
+++ head/graphics/opencv/Makefile	Sun Dec  8 10:55:57 2013	(r335874)
@@ -30,7 +30,6 @@ CMAKE_ARGS+=	-DWITH_CUDA:BOOL=Off \
 		-DBUILD_TESTS:BOOL=Off \
 		-DBUILD_DOCS:BOOL=Off \
 		-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_CMD}
-CFLAGS+=	-I${LOCALBASE}/include
 
 SUB_FILES=	FindOpenCVCore.cmake
 SUB_LIST=	OCV_VERSION=${PORTVERSION}
@@ -193,6 +192,7 @@ LIB_DEPENDS+=	libopencv_legacy.so:${PORT
 BUILD_DEPENDS+=	${PYNUMPY}
 RUN_DEPENDS+=	${PYNUMPY}
 USE_PYTHON=	yes
+CFLAGS+=	-I${LOCALBASE}/include
 CMAKE_ARGS+=	-DBUILD_opencv_python:BOOL=On
 . for module in ${OCV_MODS} ${OCV_CORE_MODS} ${OCV_JAVA_MODS}
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off


More information about the svn-ports-head mailing list