From 92f501b45198e26d8413389d799fe71b1d7535a5 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 21 Dec 2015 16:36:34 -0800 Subject: opencv: limit ARM_INSTRUCTION_SET = "arm" over-ride to armv4/armv5 Signed-off-by: Andre McCurdy Signed-off-by: Martin Jansa --- meta-oe/recipes-support/opencv/opencv_2.4.bb | 3 ++- meta-oe/recipes-support/opencv/opencv_3.0.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'meta-oe/recipes-support/opencv') diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb index 14d025c36..508655ee2 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb @@ -5,7 +5,8 @@ SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14" -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0" diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb index dee443603..8ffe1cf79 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb @@ -5,7 +5,8 @@ SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0ea90d28b4de883d7af5e6711f14f7bf" -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3-54-g00ecf