summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch235
1 files changed, 0 insertions, 235 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch
deleted file mode 100644
index 39d40983..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch
+++ /dev/null
@@ -1,235 +0,0 @@
1From 8a5804c723c5bd396e5029f254f866f19a679cc5 Mon Sep 17 00:00:00 2001
2From: Erin Park <erin.park@intel.com>
3Date: Wed, 11 Sep 2019 09:04:23 -0700
4Subject: [PATCH 1/7] R2 Build fixes
5
6-Update to R3
7-linux os-release name search
8-Use system libraries for (OMP/TBB)
9-Use system libraries for ngraph, ade, puigxml, gflags
10-Turn on ENABLE_PYTHON
11
12Upstream-Status: Pending [Taken from Clear Linux and updated to R3]
13Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
14Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
15---
16 inference-engine/CMakeLists.txt | 4 +++
17 inference-engine/cmake/dependencies.cmake | 30 ++++++++++++----------
18 inference-engine/cmake/developer_package.cmake | 12 ++++-----
19 inference-engine/cmake/ie_parallel.cmake | 6 ++---
20 inference-engine/cmake/linux_name.cmake | 2 +-
21 inference-engine/samples/CMakeLists.txt | 2 --
22 .../src/inference_engine/CMakeLists.txt | 5 ++--
23 inference-engine/thirdparty/CMakeLists.txt | 9 -------
24 8 files changed, 34 insertions(+), 36 deletions(-)
25
26diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
27index f41d9df..a282cb4 100644
28--- a/inference-engine/CMakeLists.txt
29+++ b/inference-engine/CMakeLists.txt
30@@ -62,6 +62,10 @@ add_cpplint_target(sample_cpplint
31 EXCLUDE_PATTERNS "thirdparty/*" "pugixml/*")
32
33 if (ENABLE_PYTHON)
34+ set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
35+
36+ #to be able to link
37+ set (LIB_FOLDER ${IE_MAIN_SOURCE_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
38 add_subdirectory(ie_bridges/python)
39 endif()
40
41diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
42index 682f2e5..36c3f4d 100644
43--- a/inference-engine/cmake/dependencies.cmake
44+++ b/inference-engine/cmake/dependencies.cmake
45@@ -51,11 +51,11 @@ if (THREADING STREQUAL "OMP")
46 ENVIRONMENT "OMP"
47 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
48 elseif(LINUX)
49- RESOLVE_DEPENDENCY(OMP
50- ARCHIVE_LIN "iomp.tgz"
51- TARGET_PATH "${TEMP}/omp"
52- ENVIRONMENT "OMP"
53- VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
54+ #RESOLVE_DEPENDENCY(OMP
55+ # ARCHIVE_LIN "iomp.tgz"
56+ # TARGET_PATH "${TEMP}/omp"
57+ # ENVIRONMENT "OMP"
58+ # VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
59 else(APPLE)
60 RESOLVE_DEPENDENCY(OMP
61 ARCHIVE_MAC "iomp_20190130_mac.tgz"
62@@ -63,8 +63,10 @@ if (THREADING STREQUAL "OMP")
63 ENVIRONMENT "OMP"
64 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
65 endif()
66- log_rpath_from_dir(OMP "${OMP}/lib")
67- debug_message(STATUS "intel_omp=" ${OMP})
68+ if (NOT LINUX)
69+ log_rpath_from_dir(OMP "${OMP}/lib")
70+ debug_message(STATUS "intel_omp=" ${OMP})
71+ endif ()
72 endif ()
73
74 ## TBB package
75@@ -77,10 +79,10 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
76 ENVIRONMENT "TBBROOT"
77 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
78 elseif(LINUX)
79- RESOLVE_DEPENDENCY(TBB
80- ARCHIVE_LIN "tbb2019_20181010_lin.tgz"
81- TARGET_PATH "${TEMP}/tbb"
82- ENVIRONMENT "TBBROOT")
83+ #RESOLVE_DEPENDENCY(TBB
84+ # ARCHIVE_LIN "tbb2019_20181010_lin.tgz"
85+ # TARGET_PATH "${TEMP}/tbb"
86+ # ENVIRONMENT "TBBROOT")
87 else(APPLE)
88 RESOLVE_DEPENDENCY(TBB
89 ARCHIVE_MAC "tbb2019_20190414_v1_mac.tgz"
90@@ -88,8 +90,10 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
91 ENVIRONMENT "TBBROOT"
92 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
93 endif()
94- log_rpath_from_dir(TBB "${TBB}/lib")
95- debug_message(STATUS "tbb=" ${TBB})
96+ if (NOT LINUX)
97+ log_rpath_from_dir(TBB "${TBB}/lib")
98+ debug_message(STATUS "tbb=" ${TBB})
99+ endif ()
100 endif ()
101
102 if (ENABLE_OPENCV)
103diff --git a/inference-engine/cmake/developer_package.cmake b/inference-engine/cmake/developer_package.cmake
104index a27143d..950ccf4 100644
105--- a/inference-engine/cmake/developer_package.cmake
106+++ b/inference-engine/cmake/developer_package.cmake
107@@ -93,12 +93,12 @@ if(NOT UNIX)
108 set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
109 set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY
110 else()
111- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
112- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
113- set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
114- set(CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
115- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
116- set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
117+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
118+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
119+ set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
120+ set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
121+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
122+ set(LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
123 set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib)
124 endif()
125
126diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
127index 97e8c5e..9b03652 100644
128--- a/inference-engine/cmake/ie_parallel.cmake
129+++ b/inference-engine/cmake/ie_parallel.cmake
130@@ -36,8 +36,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
131 endif ()
132
133 if (NOT TBB_INCLUDE_DIRS OR NOT TBB_LIBRARIES_RELEASE)
134- find_path(TBB_INCLUDE_DIRS tbb/tbb.h ${incl_path} NO_DEFAULT_PATH)
135- find_library(TBB_LIBRARIES_RELEASE tbb ${lib_rel_path} NO_DEFAULT_PATH)
136+ find_path(TBB_INCLUDE_DIRS tbb/tbb.h)
137+ find_library(TBB_LIBRARIES_RELEASE tbb)
138 ext_message(STATUS "TBB include: ${TBB_INCLUDE_DIRS}")
139 ext_message(STATUS "TBB Release lib: ${TBB_LIBRARIES_RELEASE}")
140 if (NOT LINUX)
141@@ -98,7 +98,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
142 endif ()
143
144 if (NOT OMP_LIBRARIES_RELEASE)
145- find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name} ${lib_rel_path} NO_DEFAULT_PATH)
146+ find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name})
147 ext_message(STATUS "OMP Release lib: ${OMP_LIBRARIES_RELEASE}")
148 if (NOT LINUX)
149 find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name} ${lib_dbg_path} NO_DEFAULT_PATH)
150diff --git a/inference-engine/cmake/linux_name.cmake b/inference-engine/cmake/linux_name.cmake
151index 6713808..7e5e47a 100644
152--- a/inference-engine/cmake/linux_name.cmake
153+++ b/inference-engine/cmake/linux_name.cmake
154@@ -5,7 +5,7 @@
155 if (LINUX)
156 function(get_linux_name res_var)
157 if (NOT EXISTS "/etc/lsb-release")
158- execute_process(COMMAND find -L /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \;
159+ execute_process(COMMAND find /usr/lib/ /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \;
160 OUTPUT_VARIABLE release_data RESULT_VARIABLE result)
161 set(name_regex "NAME=\"([^ \"\n]*).*\"\n")
162 set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"")
163diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
164index d3a094c..884b0a6 100644
165--- a/inference-engine/samples/CMakeLists.txt
166+++ b/inference-engine/samples/CMakeLists.txt
167@@ -91,8 +91,6 @@ set (GFLAGS_IS_SUBPROJECT TRUE)
168 set (HAVE_SYS_STAT_H 1)
169 set (HAVE_INTTYPES_H 1)
170
171-add_subdirectory(thirdparty/gflags)
172-
173 if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
174 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
175 endif()
176diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
177index f4b34ad..2604c32 100644
178--- a/inference-engine/src/inference_engine/CMakeLists.txt
179+++ b/inference-engine/src/inference_engine/CMakeLists.txt
180@@ -116,6 +116,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}
181 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src")
182 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src")
183 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv")
184+include_directories(${TARGET_NAME} "/usr/include/ngraph")
185
186 if(ENABLE_MKL_DNN)
187 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak")
188@@ -125,7 +126,7 @@ if(ENABLE_UNICODE_PATH_SUPPORT)
189 target_compile_definitions(${TARGET_NAME} PUBLIC ENABLE_UNICODE_PATH_SUPPORT)
190 endif()
191
192-set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
193+set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} SOVERSION 1)
194
195 # Static library used for unit tests which are always built
196
197@@ -159,7 +160,7 @@ if(ENABLE_UNICODE_PATH_SUPPORT)
198 target_compile_definitions(${TARGET_NAME}_s PUBLIC ENABLE_UNICODE_PATH_SUPPORT)
199 endif()
200
201-set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s)
202+set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s SOVERSION 1)
203
204 target_link_libraries(${TARGET_NAME}_s PRIVATE fluid
205 PRIVATE ngraph
206diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
207index 54de20f..4ea20f5 100644
208--- a/inference-engine/thirdparty/CMakeLists.txt
209+++ b/inference-engine/thirdparty/CMakeLists.txt
210@@ -35,10 +35,6 @@ function(build_with_lto)
211 set(CMAKE_RANLIB "gcc-ranlib")
212 endif()
213
214- add_subdirectory(pugixml)
215- export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake")
216- export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
217-
218 if (TARGET pugixml_mt)
219 export(TARGETS pugixml_mt NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake")
220 export(TARGETS pugixml_mt NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
221@@ -46,11 +42,6 @@ function(build_with_lto)
222
223 add_subdirectory(stb_lib)
224
225- add_subdirectory(ade)
226- export(TARGETS ade NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
227-
228- include(ngraph.cmake)
229-
230 add_subdirectory(fluid/modules/gapi)
231 export(TARGETS fluid NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
232 endfunction()
233--
2342.7.4
235
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-28 04:06:33 +0000