mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
a277d1f7a0
(From OE-Core rev: d0a546e21760004897f814981445433a5d5e69a6) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
From e6eb7536fcfc2c75f7831f67b1f16f3f36ef2545 Mon Sep 17 00:00:00 2001
|
|
From: Andrey Zhizhikin <andrey.z@gmail.com>
|
|
Date: Mon, 27 Jan 2020 10:22:35 +0000
|
|
Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build
|
|
|
|
When Yocto build is performed, opencv searches for data dir using simple
|
|
'test' command, this fails because pkg-config provides an absolute
|
|
path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR
|
|
in order for the 'test' utility to pick up the absolute path.
|
|
|
|
Upstream-Status: Inappropriate [OE-specific]
|
|
|
|
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
|
|
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
|
|
|
|
---
|
|
ext/opencv/meson.build | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
|
|
index 37e2015..326f737 100644
|
|
--- a/ext/opencv/meson.build
|
|
+++ b/ext/opencv/meson.build
|
|
@@ -87,6 +87,9 @@ if opencv_found
|
|
opencv_prefix = opencv_dep.get_variable('prefix')
|
|
gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"']
|
|
|
|
+ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip()
|
|
+ opencv_prefix = pkgconf_sysroot + opencv_prefix
|
|
+
|
|
# Check the data dir used by opencv for its xml data files
|
|
# Use prefix from pkg-config to be compatible with cross-compilation
|
|
r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false)
|