diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch index 9e71e689..292c534a 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7deabff3d51df783c3e24bcc190c3ddebca7d9a8 Mon Sep 17 00:00:00 2001 | 1 | From a704afcc9e238dceafb3b1bc91b0b8abed3593eb Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Thu, 21 Sep 2023 14:07:28 +0800 | 3 | Date: Thu, 21 Sep 2023 14:07:28 +0800 |
4 | Subject: [PATCH] cmake: yocto specific tweaks to the build process | 4 | Subject: [PATCH] cmake: yocto specific tweaks to the build process |
@@ -8,6 +8,7 @@ Subject: [PATCH] cmake: yocto specific tweaks to the build process | |||
8 | * Install sample binaries as well. | 8 | * Install sample binaries as well. |
9 | * Dont strip binaries. | 9 | * Dont strip binaries. |
10 | * Dont try to write triggers for CPack. We package ourselves. | 10 | * Dont try to write triggers for CPack. We package ourselves. |
11 | * Fix the installation path for Python modules when baselib = lib64. | ||
11 | 12 | ||
12 | Upstream-Status: Inappropriate | 13 | Upstream-Status: Inappropriate |
13 | 14 | ||
@@ -16,9 +17,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
16 | cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- | 17 | cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- |
17 | cmake/developer_package/target_flags.cmake | 2 +- | 18 | cmake/developer_package/target_flags.cmake | 2 +- |
18 | samples/cpp/CMakeLists.txt | 6 +++--- | 19 | samples/cpp/CMakeLists.txt | 6 +++--- |
20 | src/bindings/python/CMakeLists.txt | 2 +- | ||
19 | src/bindings/python/wheel/setup.py | 1 - | 21 | src/bindings/python/wheel/setup.py | 1 - |
20 | thirdparty/dependencies.cmake | 10 +++++----- | 22 | thirdparty/dependencies.cmake | 10 +++++----- |
21 | 5 files changed, 10 insertions(+), 11 deletions(-) | 23 | 6 files changed, 11 insertions(+), 12 deletions(-) |
22 | 24 | ||
23 | diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake | 25 | diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake |
24 | index 0609750054f..0f5c7765197 100644 | 26 | index 0609750054f..0f5c7765197 100644 |
@@ -60,6 +62,19 @@ index 8849aaf47d1..450b57c18d6 100644 | |||
60 | 62 | ||
61 | # create global target with all samples / demo apps | 63 | # create global target with all samples / demo apps |
62 | if(NOT TARGET ie_samples) | 64 | if(NOT TARGET ie_samples) |
65 | diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt | ||
66 | index f337f403189..21012162093 100644 | ||
67 | --- a/src/bindings/python/CMakeLists.txt | ||
68 | +++ b/src/bindings/python/CMakeLists.txt | ||
69 | @@ -314,7 +314,7 @@ if(ENABLE_PYTHON_PACKAGING) | ||
70 | endif() | ||
71 | |||
72 | set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}") | ||
73 | - set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}") | ||
74 | + set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}") | ||
75 | set(meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info") | ||
76 | set(meta_info_file "${install_lib}/${meta_info_subdir}/PKG-INFO") | ||
77 | |||
63 | diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py | 78 | diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py |
64 | index 04323a8ba49..0498dcdc126 100644 | 79 | index 04323a8ba49..0498dcdc126 100644 |
65 | --- a/src/bindings/python/wheel/setup.py | 80 | --- a/src/bindings/python/wheel/setup.py |