diff options
| author | markd <markd@pkgsrc.org> | 2016-07-16 03:49:56 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2016-07-16 03:49:56 +0000 |
| commit | b19c37d49d439fa57776140797e47568e7520255 (patch) | |
| tree | 4a505fa85e6cabc3e85b5f2a1f7c6bda0910814f /graphics | |
| parent | 67a96a1d83141e2b48bdcd3c57180c205e24f176 (diff) | |
| download | pkgsrc-b19c37d49d439fa57776140797e47568e7520255.tar.gz | |
gcc6 build fix
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/opencv/distinfo | 3 | ||||
| -rw-r--r-- | graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index eed64253291..54c369ca401 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2016/03/01 20:14:24 joerg Exp $ +$NetBSD: distinfo,v 1.36 2016/07/16 03:49:56 markd Exp $ SHA1 (opencv-3.1.0.zip) = 8c932b68fe2e1575e88dde759ab1ed1d53d6f41b RMD160 (opencv-3.1.0.zip) = d7a811c67cfb16243470822150760252d5770165 @@ -10,6 +10,7 @@ SHA1 (patch-apps_createsamples_CMakeLists.txt) = 2d60ecc0e1674cde4414e91e837c24f SHA1 (patch-apps_traincascade_CMakeLists.txt) = 7114cc4c2057e12dc8e47bc61334cb8e175987eb SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20 SHA1 (patch-cmake_OpenCVModule.cmake) = 7667f19f3e9c6ff757d92a6a49e7c3430c6c080d +SHA1 (patch-cmake_OpenCVPCHSupport.cmake) = 237fa2d000c402c55dfdbec3e27c89cffdfde8b1 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471 SHA1 (patch-modules_core_src_parallel__pthreads.cpp) = c64ef8872c120db0ab92582496235858eec9bf92 diff --git a/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake b/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake new file mode 100644 index 00000000000..7f5f23eaf0d --- /dev/null +++ b/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake @@ -0,0 +1,15 @@ +$NetBSD: patch-cmake_OpenCVPCHSupport.cmake,v 1.1 2016/07/16 03:49:57 markd Exp $ + +gcc6 trips up ".../cstdlib:75:25: fatal error: stdlib.h: No such file or directory" because of -isystem + +--- cmake/OpenCVPCHSupport.cmake.orig 2015-12-18 15:02:16.000000000 +0000 ++++ 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() + |