diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2015-12-21 16:36:34 -0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-01-14 11:22:09 +0100 |
commit | 651fdfc6492d08f93316595a4ec905b6a67e69b4 (patch) | |
tree | 01c2d74f7efedc5f6e8a45342ee4ac6659820e17 | |
parent | 5b64550b803950e0a6ee2f66084c877fc122725e (diff) | |
download | meta-openembedded-651fdfc6492d08f93316595a4ec905b6a67e69b4.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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_2.4.bb | 3 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_3.0.bb | 3 |
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 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" | |||
5 | LICENSE = "BSD-3-Clause" | 5 | LICENSE = "BSD-3-Clause" |
6 | LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14" | 6 | LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14" |
7 | 7 | ||
8 | ARM_INSTRUCTION_SET = "arm" | 8 | ARM_INSTRUCTION_SET_armv4 = "arm" |
9 | ARM_INSTRUCTION_SET_armv5 = "arm" | ||
9 | 10 | ||
10 | DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0" | 11 | DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0" |
11 | 12 | ||
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" | |||
5 | LICENSE = "BSD-3-Clause" | 5 | LICENSE = "BSD-3-Clause" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0ea90d28b4de883d7af5e6711f14f7bf" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0ea90d28b4de883d7af5e6711f14f7bf" |
7 | 7 | ||
8 | ARM_INSTRUCTION_SET = "arm" | 8 | ARM_INSTRUCTION_SET_armv4 = "arm" |
9 | ARM_INSTRUCTION_SET_armv5 = "arm" | ||
9 | 10 | ||
10 | DEFAULT_PREFERENCE = "-1" | 11 | DEFAULT_PREFERENCE = "-1" |
11 | 12 | ||