aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-12-21 16:36:34 -0800
committerMartin Jansa <Martin.Jansa@gmail.com>2016-01-04 14:56:23 +0100
commit92f501b45198e26d8413389d799fe71b1d7535a5 (patch)
tree8cecde901851ee5032e368848268c4992ed952d0
parent2f717fb4ca272c1363adc3e1e6d2cf5289ebe991 (diff)
downloadmeta-openembedded-contrib-92f501b45198e26d8413389d799fe71b1d7535a5.tar.gz
opencv: limit ARM_INSTRUCTION_SET = "arm" over-ride to armv4/armv5
Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/opencv/opencv_2.4.bb3
-rw-r--r--meta-oe/recipes-support/opencv/opencv_3.0.bb3
2 files changed, 4 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 14d025c366..508655ee2d 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 dee4436033..8ffe1cf799 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"