diff options
| author | Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2016-04-01 23:36:29 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-12 11:07:47 +0200 |
| commit | e8d4278779b87eb5ecf4ec74e21b4adf38350b0a (patch) | |
| tree | 6966357511008d931a33b3901531dd3f348f1ea8 | |
| parent | 5abe2dcc531e597d896fb919b9e825d003c35f24 (diff) | |
| download | meta-openembedded-e8d4278779b87eb5ecf4ec74e21b4adf38350b0a.tar.gz | |
opencv: Fix build on x86 platform
OpenCV wrongly assumes that the X86 variable would be set on Intel 32
bit architectures.
This patch adds the missing definition on those cases.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv_3.1.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index 63955a862d..0f6fb63e85 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb | |||
| @@ -45,6 +45,7 @@ EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI | |||
| 45 | ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ | 45 | ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ |
| 46 | ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ | 46 | ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ |
| 47 | " | 47 | " |
| 48 | EXTRA_OECMAKE_append_x86 = " -DX86=ON" | ||
| 48 | 49 | ||
| 49 | PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \ | 50 | PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \ |
| 50 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ | 51 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ |