diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-05-17 05:11:22 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-05-17 21:00:16 +0200 |
| commit | 60cc0ba4b3a97804c9230cddbdeb1999f5023368 (patch) | |
| tree | 36da96437d2a9017b14a05ad3d0d3d4608f3189e /package/opencv/opencv.mk | |
| parent | cb30e130519fcb50e1a2e0d7a02aa628e52ed24c (diff) | |
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 <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/opencv/opencv.mk')
| -rw-r--r-- | package/opencv/opencv.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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 |