mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

opencv: Fix build with gcc 6.0

Browse Source 
It seems like gcc 6.0 does not have the same behaviour as previous 5.x
with regards isystem flag.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Ricardo Ribalda Delgado
2016-08-05 18:38:47 +02:00
committed by Martin Jansa
parent 2e0332ce3c
commit 886a5da6ac
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/opencv/opencv/fixgcc60.patch
+30
View File
@@ -0,0 +1,30 @@
diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
index 28ccc1c6be4f..b0e1cbf77287 100644
--- a/cmake/OpenCVPCHSupport.cmake
+++ b/cmake/OpenCVPCHSupport.cmake
@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
OUTPUT_VARIABLE gcc_compiler_version)
#MESSAGE("GCC Version: ${gcc_compiler_version}")
- IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
+ IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
SET(PCHSupport_FOUND TRUE)
ENDIF()
diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
index 3a23cd73633d..1fea1578b1d9 100644
--- a/cmake/OpenCVUtils.cmake
+++ b/cmake/OpenCVUtils.cmake
@@ -76,7 +76,11 @@ function(ocv_include_directories)
if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}")
list(APPEND __add_before "${dir}")
else()
- include_directories(AFTER SYSTEM "${dir}")
+ if (gcc_compiler_version VERSION_LESS "6.0.0")
+ include_directories(AFTER SYSTEM "${dir}")
+ else()
+ include_directories(AFTER "${dir}")
+ endif()
endif()
endforeach()
include_directories(BEFORE ${__add_before})
meta-oe/recipes-support/opencv/opencv_3.1.bb
+1 -3
View File
@@ -22,6 +22,7 @@ SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \
git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \ git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \
git://github.com/Itseez/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=party3;name=party3 \ git://github.com/Itseez/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=party3;name=party3 \
file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
file://fixgcc60.patch \
file://fixpkgconfig.patch" file://fixpkgconfig.patch"
PV = "3.1+git${SRCPV}" PV = "3.1+git${SRCPV}"
@@ -145,6 +146,3 @@ do_install_append() {
install -d ${D}${datadir}/OpenCV/samples/bin/ install -d ${D}${datadir}/OpenCV/samples/bin/
cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/ cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/
} }
# http://errors.yoctoproject.org/Errors/Details/68617/
PNBLACKLIST[opencv] ?= "BROKEN: fails to build with gcc-6"