summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWook Song <wook16.song@samsung.com>2023-06-16 00:35:51 +0900
committerWook Song <wook16.song@samsung.com>2023-06-16 00:35:51 +0900
commit700368c86602b13ff18d03ff1b9348c9e5b3477a (patch)
tree1592bced05b61a7d72eeb7e96007fc678fef8658
parent62176275f4dec6cc60f7a8ccb08315ee55a74343 (diff)
downloaddldt-accepted/tizen_unified.tar.gz
dldt-accepted/tizen_unified.tar.bz2
dldt-accepted/tizen_unified.zip
To fix build breaks on Tizen gcc-13, this patch revises the files in the packaging directory as follows: - Add an additional local patch file - Update third-party external packages such as ngraph and ade - Improve the rpm spec file to fix the build breaks Change-Id: Ic13d025f788c78627d41f9e9baaab33e504a095c Signed-off-by: Wook Song <wook16.song@samsung.com>
-rw-r--r--packaging/0004-Tizen-Fix-build-breaks-on-Tizen-GCC-13.patch43
-rw-r--r--packaging/ade-cbe2db61a659c2cc304c3837406f95c39dfa938e.tar.gzbin117500 -> 116606 bytes
-rw-r--r--packaging/ngraph-0.22.0-rc.2.tar.gzbin13406708 -> 13451788 bytes
-rw-r--r--packaging/openvino.spec4
4 files changed, 47 insertions, 0 deletions
diff --git a/packaging/0004-Tizen-Fix-build-breaks-on-Tizen-GCC-13.patch b/packaging/0004-Tizen-Fix-build-breaks-on-Tizen-GCC-13.patch
new file mode 100644
index 000000000..cdcdc694e
--- /dev/null
+++ b/packaging/0004-Tizen-Fix-build-breaks-on-Tizen-GCC-13.patch
@@ -0,0 +1,43 @@
+From a5161fa887579178e09f770e7065becfef1e4bf2 Mon Sep 17 00:00:00 2001
+From: Wook Song <wook16.song@samsung.com>
+Date: Thu, 15 Jun 2023 23:57:31 +0900
+Subject: [PATCH 1/1] [Tizen] Fix build breaks on Tizen GCC 13
+
+To fix build breaks on Tizen GCC 13, this patch removes -Wuninitialized
+from os_flags.cmake and adds #include <time.h> to the file_util.hpp.
+
+Change-Id: Ic5dfbc8c688393161567dccc01294fbf94bca6bd
+Signed-off-by: Wook Song <wook16.song@samsung.com>
+---
+ inference-engine/cmake/os_flags.cmake | 2 +-
+ inference-engine/src/inference_engine/file_utils.h | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake
+index ad1585997..bd27df6a9 100644
+--- a/inference-engine/cmake/os_flags.cmake
++++ b/inference-engine/cmake/os_flags.cmake
+@@ -56,7 +56,7 @@ else()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wswitch")
+ elseif(UNIX)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wuninitialized -Winit-self")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Winit-self")
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-switch")
+ else()
+diff --git a/inference-engine/src/inference_engine/file_utils.h b/inference-engine/src/inference_engine/file_utils.h
+index ce79a9f17..591335491 100644
+--- a/inference-engine/src/inference_engine/file_utils.h
++++ b/inference-engine/src/inference_engine/file_utils.h
+@@ -23,6 +23,7 @@
+ # include <mach/mach.h>
+ #endif
+
++#include <time.h>
+ #include "ie_api.h"
+
+ namespace FileUtils {
+--
+2.25.1
+
diff --git a/packaging/ade-cbe2db61a659c2cc304c3837406f95c39dfa938e.tar.gz b/packaging/ade-cbe2db61a659c2cc304c3837406f95c39dfa938e.tar.gz
index c5f31158e..822461d88 100644
--- a/packaging/ade-cbe2db61a659c2cc304c3837406f95c39dfa938e.tar.gz
+++ b/packaging/ade-cbe2db61a659c2cc304c3837406f95c39dfa938e.tar.gz
Binary files differ
diff --git a/packaging/ngraph-0.22.0-rc.2.tar.gz b/packaging/ngraph-0.22.0-rc.2.tar.gz
index 5ed7dc3b2..85694ea60 100644
--- a/packaging/ngraph-0.22.0-rc.2.tar.gz
+++ b/packaging/ngraph-0.22.0-rc.2.tar.gz
Binary files differ
diff --git a/packaging/openvino.spec b/packaging/openvino.spec
index b933eccf6..6c3d78207 100644
--- a/packaging/openvino.spec
+++ b/packaging/openvino.spec
@@ -59,6 +59,7 @@ Source1003: openvino.pc.in
Patch0: 0001-CMake-Do-not-call-get_linux_name-when-LINUX_OS_NAME-.patch
Patch1: 0002-CMake-Add-a-variable-to-resolve-dependency-on-TBB-us.patch
Patch2: 0003-VPU-CMake-Add-a-cmake-option-to-skip-downloading-MVN.patch
+Patch3: 0004-Tizen-Fix-build-breaks-on-Tizen-GCC-13.patch
BuildRequires: cmake
BuildRequires: pkgconfig(libtbb)
BuildRequires: pkgconfig(libusb-1.0)
@@ -94,6 +95,7 @@ This contains corresponding header files and static archives.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
cp %{SOURCE1} .
cp %{SOURCE1001} ./inference-engine/thirdparty
cp %{SOURCE1002} ./inference-engine/thirdparty
@@ -109,7 +111,9 @@ popd
rm -rf build && mkdir -p build
pushd build
CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS=${CFLAGS/-Wall/};
+CFLAGS=`echo ${CFLAGS} -Wno-format-truncation`
CXXFLAGS="${CXXFLAGS:-%optflags}"; export CXXFLAGS=${CXXFLAGS/-Wall/};
+CXXFLAGS=`echo ${CXXFLAGS} -Wno-format-truncation -Wno-unused-const-variable -Wno-free-nonheap-object -Wno-deprecated-declarations -Wno-array-bounds`
FFLAGS="${FFLAGS:-%optflags}"; export FFLAGS=${FFLAGS/-Wall/};
cmake .. \
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \