opencv: bump SRCREV and make recipe multilib build compatible
PATCH 1/1 opencv: bump SRCREV and make recipe multilib build compatible
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 <[email protected]>
--- meta-oe/recipes-support/opencv/opencv_2.4.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-support/opencv/opencv_2.4.bb +2 -2
@@ -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"
Signature · 1 line
1.7.9.5