diff options
| author |   Amy Liffey <amynka@gentoo.org> | 2017-06-06 16:42:31 +0200 |
|---|---|---|
| committer | Amy Liffey <amynka@gentoo.org> | 2017-06-06 16:42:31 +0200 |
| commit | 4f5b990bd068f98184e7ecfabf461a33275569c5 (patch) | |
| tree | 69428af4fd0a06ce6b9a9a22dc108c3ff6cf7242 /media-libs/opencv/files | |
| parent | www-client/chromium: update openh264 dependency (diff) | |
| download | gentoo-4f5b990bd068f98184e7ecfabf461a33275569c5.tar.gz gentoo-4f5b990bd068f98184e7ecfabf461a33275569c5.tar.bz2 gentoo-4f5b990bd068f98184e7ecfabf461a33275569c5.zip | |
media-libs/opencv: disable pch for gcc-6.0 bug #617654
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'media-libs/opencv/files')
| -rw-r--r-- | media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch | 23 | ||||
| -rw-r--r-- | media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch | 11 |
2 files changed, 34 insertions, 0 deletions
diff --git a/media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch b/media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch new file mode 100644 index 000000000000..b0a5084752ca --- /dev/null +++ b/media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch @@ -0,0 +1,23 @@ +From fb598bb76a0431aa3a880ecfa45054c996a070fb Mon Sep 17 00:00:00 2001 +From: Maksim Shabunin <maksim.shabunin@itseez.com> +Date: Fri, 13 May 2016 13:28:09 +0300 +Subject: [PATCH] Disabled PCH support for gcc >= 6.0.0 + +Command line generation routine uses "-isystem" to include headers outside of "<opencv>/modules" folder, but GCC 6 does not work when passed "-isystem /usr/include" option. +--- + cmake/OpenCVPCHSupport.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake +index 13619daf27e..e6585cae020 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/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch b/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch new file mode 100644 index 000000000000..457d3595e49b --- /dev/null +++ b/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch @@ -0,0 +1,11 @@ +--- a/cmake/OpenCVPCHSupport.cmake 2017-06-06 15:05:09.180022719 +0200 ++++ b/cmake/OpenCVPCHSupport.cmake 2017-06-06 15:05:50.775022684 +0200 +@@ -14,7 +14,7 @@ + + IF(CMAKE_COMPILER_IS_GNUCXX) + +- IF(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.2.0") ++ IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0") + SET(PCHSupport_FOUND TRUE) + ENDIF() + |