[oe] [meta-oe][PATCH] opencv: bump SRCREV and make recipe multilib build compatible
Nick D'Ademo
nickdademo at gmail.com
Thu Nov 28 02:23:03 UTC 2013
Pass LIB_SUFFIX to CMake during a multilib build so that the generated library folder has the correct suffix.
Signed-off-by: Nick D'Ademo <nickdademo at gmail.com>
---
meta-oe/recipes-support/opencv/opencv_2.4.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index 8d4d8da..df89b0a 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -27,8 +27,8 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}
-DWITH_GSTREAMER=OFF \
-DCMAKE_SKIP_RPATH=ON \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
- ${@bb.utils.contains("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
- ${@bb.utils.contains("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
+ ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
+ ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
"
PACKAGECONFIG ??= "eigen gtk jpeg libav png tiff v4l"
--
1.7.9.5
More information about the Openembedded-devel
mailing list