summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-09-11 08:10:54 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2017-09-13 11:13:25 +0200
commit4a45235796df0ca1b3bca5407b9615281cf8889d (patch)
tree4bce84303452479fd38f93fdc6ae6c99743a0dee
parent80f47fd89294c7ffa17b74f0fd8ec22811d41637 (diff)
downloadmeta-openembedded-4a45235796df0ca1b3bca5407b9615281cf8889d.tar.gz
opencv: Fix build with clang
-isystem is not needed even with clang Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch26
-rw-r--r--meta-oe/recipes-support/opencv/opencv_3.3.bb2
2 files changed, 27 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch b/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch
new file mode 100644
index 000000000..6dd48fcdc
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch
@@ -0,0 +1,26 @@
1From 2bc6bb9831d07f035fea74ea745cea43dd5f9ef9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 9 Sep 2017 23:48:31 -0700
4Subject: [PATCH] Dont use isystem
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8Upstream-Status: Pending
9
10 cmake/OpenCVPCHSupport.cmake | 10 ++++------
11 1 file changed, 4 insertions(+), 6 deletions(-)
12
13Index: git/cmake/OpenCVPCHSupport.cmake
14===================================================================
15--- git.orig/cmake/OpenCVPCHSupport.cmake
16+++ git/cmake/OpenCVPCHSupport.cmake
17@@ -17,7 +17,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
18 IF(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.2.0")
19 SET(PCHSupport_FOUND TRUE)
20 ENDIF()
21-
22+ SET(CMAKE_INCLUDE_SYSTEM_FLAG_C "-I")
23+ SET(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-I")
24 SET(_PCH_include_prefix "-I")
25 SET(_PCH_isystem_prefix "-isystem")
26 SET(_PCH_define_prefix "-D")
diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb b/meta-oe/recipes-support/opencv/opencv_3.3.bb
index efbb2f52a..25f247662 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.3.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.3.bb
@@ -49,8 +49,8 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
49 file://0001-build-workaround-GCC-7.1.1-compilation-issue-with-sa.patch \ 49 file://0001-build-workaround-GCC-7.1.1-compilation-issue-with-sa.patch \
50 file://0002-imgcodecs-refactoring-improve-code-quality.patch \ 50 file://0002-imgcodecs-refactoring-improve-code-quality.patch \
51 file://0003-imgproc-test-add-checks-for-remove-call.patch \ 51 file://0003-imgproc-test-add-checks-for-remove-call.patch \
52 file://0001-Dont-use-isystem.patch \
52" 53"
53
54PV = "3.3+git${SRCPV}" 54PV = "3.3+git${SRCPV}"
55 55
56S = "${WORKDIR}/git" 56S = "${WORKDIR}/git"