Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id BA9877A140 for ; Sat, 16 Jul 2016 03:49:58 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 337FD85E99; Sat, 16 Jul 2016 03:49:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B5BE385E7D for ; Sat, 16 Jul 2016 03:49:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id IY8dpEabDtDG for ; Sat, 16 Jul 2016 03:49:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3B92E84CE9 for ; Sat, 16 Jul 2016 03:49:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 363FEFBB5; Sat, 16 Jul 2016 03:49:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1468640997172770" MIME-Version: 1.0 Date: Sat, 16 Jul 2016 03:49:57 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/graphics/opencv To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20160716034957.363FEFBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1468640997172770 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Sat Jul 16 03:49:57 UTC 2016 Modified Files: pkgsrc/graphics/opencv: distinfo Added Files: pkgsrc/graphics/opencv/patches: patch-cmake_OpenCVPCHSupport.cmake Log Message: gcc6 build fix To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 pkgsrc/graphics/opencv/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1468640997172770 Content-Disposition: inline Content-Length: 2288 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/opencv/distinfo diff -u pkgsrc/graphics/opencv/distinfo:1.35 pkgsrc/graphics/opencv/distinfo:1.36 --- pkgsrc/graphics/opencv/distinfo:1.35 Tue Mar 1 20:14:24 2016 +++ pkgsrc/graphics/opencv/distinfo Sat Jul 16 03:49:56 2016 @@ -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_CMakeList 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 Added files: Index: pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake diff -u /dev/null pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake:1.1 --- /dev/null Sat Jul 16 03:49:57 2016 +++ pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport.cmake Sat Jul 16 03:49:57 2016 @@ -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() + --_----------=_1468640997172770--