From 60cc0ba4b3a97804c9230cddbdeb1999f5023368 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 17 May 2012 05:11:22 +0000 Subject: opencv: add zlib dependency The opencv package selects zlib, but it does not depend on it. This leads to cases where opencv gets built before zlib, and in this case, opencv uses its internal version of zlib, which doesn't build properly (it has some conditional code for ARM that is probably broken), see: http://autobuild.buildroot.org/results/45f4e195fe0cc5acace10287f5ff33aa953d5430/build-end.log We fix this by properly adding the opencv dependency on zlib. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/opencv/opencv.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package') diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index d415e5192..ec9471518 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -35,6 +35,8 @@ OPENCV_CONF_OPT = \ -DWITH_UNICAP=OFF \ -DWITH_XINE=OFF +OPENCV_DEPENDENCIES += zlib + ifeq ($(BR2_PACKAGE_OPENCV_WITH_PYTHON),y) OPENCV_CONF_OPT += -DBUILD_NEW_PYTHON_SUPPORT=ON OPENCV_DEPENDENCIES += python -- cgit v1.2.3