diff options
author | Yogesh Tyagi <yogesh.tyagi@intel.com> | 2023-12-01 08:48:36 +0530 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2023-12-01 11:43:15 +0800 |
commit | c93900c6ed774496dd7a4974e76e9767e87591d3 (patch) | |
tree | ef3cb758f8bf1de87b75dac56796531d7b21f8a4 /dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch | |
parent | b3fca0034e9783eafa86d1ae824ec396ede14d6c (diff) | |
download | meta-intel-c93900c6ed774496dd7a4974e76e9767e87591d3.tar.gz |
openvino-inference-engine: upgrade 2023.1.0 -> 2023.2.0
* Release notes:
https://github.com/openvinotoolkit/openvino/releases/tag/2023.2.0
* Drop the patches which included header cstdint to fix build issues with gcc13 as
these changes are already incorporated in the upstream code.
* gflags and zlib are now used as bundled dependencies
https://github.com/openvinotoolkit/openvino/pull/20762
* Refresh the patches
Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch new file mode 100644 index 00000000..7ab31309 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch | |||
@@ -0,0 +1,90 @@ | |||
1 | From bfcf5ae581ca4e7266cf7dc65b1c71754cd78cc0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 29 Nov 2023 12:42:57 +0530 | ||
4 | Subject: [PATCH 1/4] cmake: yocto specific tweaks to the build process | ||
5 | |||
6 | * Dont try to detect glibc version as that doesn't work when cross compiling. | ||
7 | * Install sample binaries as well. | ||
8 | * Dont strip binaries. | ||
9 | * Dont try to write triggers for CPack. We package ourselves. | ||
10 | * Fix the installation path for Python modules when baselib = lib64. | ||
11 | |||
12 | Upstream-Status: Inappropriate | ||
13 | |||
14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
15 | --- | ||
16 | cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- | ||
17 | cmake/developer_package/target_flags.cmake | 2 +- | ||
18 | samples/cpp/CMakeLists.txt | 6 +++--- | ||
19 | src/bindings/python/CMakeLists.txt | 2 +- | ||
20 | src/bindings/python/wheel/setup.py | 1 - | ||
21 | 5 files changed, 6 insertions(+), 7 deletions(-) | ||
22 | |||
23 | diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake | ||
24 | index a7c0ec2cf61..40448e8a962 100644 | ||
25 | --- a/cmake/developer_package/packaging/rpm/rpm.cmake | ||
26 | +++ b/cmake/developer_package/packaging/rpm/rpm.cmake | ||
27 | @@ -154,7 +154,7 @@ ov_rpm_specific_settings() | ||
28 | # needed to add triggers for packages with libraries | ||
29 | set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers") | ||
30 | set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n") | ||
31 | -file(WRITE "${def_triggers}" "${triggers_content}") | ||
32 | +#file(WRITE "${def_triggers}" "${triggers_content}") | ||
33 | |||
34 | # | ||
35 | # Functions helpful for packaging your modules with RPM cpack | ||
36 | diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake | ||
37 | index 29f23e713e1..942dd445b19 100644 | ||
38 | --- a/cmake/developer_package/target_flags.cmake | ||
39 | +++ b/cmake/developer_package/target_flags.cmake | ||
40 | @@ -145,4 +145,4 @@ function(ov_glibc_version) | ||
41 | endif() | ||
42 | endfunction() | ||
43 | |||
44 | -ov_glibc_version() | ||
45 | +#ov_glibc_version() | ||
46 | diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt | ||
47 | index c814cc37e2c..431e7bd2ed3 100644 | ||
48 | --- a/samples/cpp/CMakeLists.txt | ||
49 | +++ b/samples/cpp/CMakeLists.txt | ||
50 | @@ -206,9 +206,9 @@ macro(ov_add_sample) | ||
51 | target_link_libraries(${SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${SAMPLE_DEPENDENCIES}) | ||
52 | |||
53 | install(TARGETS ${SAMPLE_NAME} | ||
54 | - RUNTIME DESTINATION samples_bin/ | ||
55 | - COMPONENT samples_bin | ||
56 | - EXCLUDE_FROM_ALL) | ||
57 | + DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
58 | + COMPONENT samples_bin) | ||
59 | + | ||
60 | |||
61 | # create global target with all samples / demo apps | ||
62 | if(NOT TARGET ov_samples) | ||
63 | diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt | ||
64 | index 58ff9b74302..4763994ba56 100644 | ||
65 | --- a/src/bindings/python/CMakeLists.txt | ||
66 | +++ b/src/bindings/python/CMakeLists.txt | ||
67 | @@ -356,7 +356,7 @@ if(ENABLE_PYTHON_PACKAGING) | ||
68 | endif() | ||
69 | |||
70 | set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}") | ||
71 | - set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}") | ||
72 | + set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}") | ||
73 | set(meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info") | ||
74 | set(meta_info_file "${install_lib}/${meta_info_subdir}/PKG-INFO") | ||
75 | |||
76 | diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py | ||
77 | index 4b056912212..5f05d891310 100644 | ||
78 | --- a/src/bindings/python/wheel/setup.py | ||
79 | +++ b/src/bindings/python/wheel/setup.py | ||
80 | @@ -270,7 +270,6 @@ class CustomBuild(build): | ||
81 | self.spawn(["cmake", "--install", binary_dir, | ||
82 | "--prefix", prefix, | ||
83 | "--config", CONFIG, | ||
84 | - "--strip", | ||
85 | "--component", cpack_comp_name]) | ||
86 | |||
87 | def run(self): | ||
88 | -- | ||
89 | 2.34.1 | ||
90 | |||