pch don't really work

in fact, it causes an ICE while building the port on amd64,
so patch it out, and bump.
This commit is contained in:
espie 2011-07-16 22:43:57 +00:00
parent 17b5e65888
commit 258e70c5fc
3 changed files with 18 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2011/06/24 11:17:05 sthen Exp $
# $OpenBSD: Makefile,v 1.3 2011/07/16 22:43:57 espie Exp $
ONLY_FOR_ARCH= ${GCC4_ARCHS}
@ -10,7 +10,7 @@ COMMENT-docs= documentation for OpenCV
V= 2.2.0
DISTNAME= OpenCV-$V
PKGNAME-main= opencv-$V
REVISION-main= 0
REVISION-main= 1
PKGNAME-docs= opencv-docs-$V
CATEGORIES= graphics devel

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-OpenCVPCHSupport_cmake,v 1.1 2011/07/16 22:43:57 espie Exp $
--- OpenCVPCHSupport.cmake.orig Sat Jul 16 23:20:31 2011
+++ OpenCVPCHSupport.cmake Sat Jul 16 23:20:38 2011
@@ -20,7 +20,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
OUTPUT_VARIABLE gcc_compiler_version)
#MESSAGE("GCC Version: ${gcc_compiler_version}")
IF(gcc_compiler_version MATCHES "4\\.[0,2-9]\\.[0-9]")
- SET(PCHSupport_FOUND TRUE)
+ SET(PCHSupport_FOUND FALSE)
ENDIF()
SET(_PCH_include_prefix "-I")

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_ml_src_gbt_cpp,v 1.1.1.1 2011/06/24 09:30:21 jasper Exp $
--- modules/ml/src/gbt.cpp.orig Sat May 14 12:36:21 2011
+++ modules/ml/src/gbt.cpp Sat May 14 12:35:56 2011
@@ -11,7 +11,7 @@
$OpenBSD: patch-modules_ml_src_gbt_cpp,v 1.2 2011/07/16 22:43:57 espie Exp $
--- modules/ml/src/gbt.cpp.orig Sun Dec 5 04:35:25 2010
+++ modules/ml/src/gbt.cpp Sat Jul 16 23:20:10 2011
@@ -11,7 +11,7 @@ using namespace std;
#define CV_CMP_FLOAT(a,b) ((a) < (b))
static CV_IMPLEMENT_QSORT_EX( icvSortFloat, float, CV_CMP_FLOAT, float)