Fri Sep 10 12:09:27 2021 UTC ()
opencv: Fix building on i386


(nia)
diff -r1.6 -r1.7 pkgsrc/graphics/opencv/Makefile.common
cvs diff -r1.6 -r1.7 pkgsrc/graphics/opencv/Makefile.common (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/Makefile.common 2020/08/16 22:18:49 1.6
+++ pkgsrc/graphics/opencv/Makefile.common 2021/09/10 12:09:27 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.6 2020/08/16 22:18:49 tnn Exp $ 1# $NetBSD: Makefile.common,v 1.7 2021/09/10 12:09:27 nia Exp $
2# used by graphics/opencv/Makefile 2# used by graphics/opencv/Makefile
3# used by graphics/opencv-contrib-face/Makefile 3# used by graphics/opencv-contrib-face/Makefile
4# 4#
5# DO NOT FORGET to regen graphics/opencv-contrib-face/distinfo! 5# DO NOT FORGET to regen graphics/opencv-contrib-face/distinfo!
6 6
7OPENCV_VERSION= 3.4.9 7OPENCV_VERSION= 3.4.9
8 8
9CATEGORIES= graphics devel 9CATEGORIES= graphics devel
10MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/} 10MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/}
11 11
12HOMEPAGE= https://opencv.org/ 12HOMEPAGE= https://opencv.org/
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
@@ -24,19 +24,27 @@ CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ @@ -24,19 +24,27 @@ CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_
24CHECK_PORTABILITY_SKIP+= platforms/ios/cmake/Toolchains/xcodebuild_wrapper.in 24CHECK_PORTABILITY_SKIP+= platforms/ios/cmake/Toolchains/xcodebuild_wrapper.in
25 25
26CMAKE_ARG_PATH= ${WRKSRC} 26CMAKE_ARG_PATH= ${WRKSRC}
27CMAKE_ARGS+= -DBUILD_PROTOBUF=OFF 27CMAKE_ARGS+= -DBUILD_PROTOBUF=OFF
28CMAKE_ARGS+= -DCV_ENABLE_INTRINSICS=OFF # XXX: problematic 28CMAKE_ARGS+= -DCV_ENABLE_INTRINSICS=OFF # XXX: problematic
29CMAKE_ARGS+= -DENABLE_CCACHE=OFF 29CMAKE_ARGS+= -DENABLE_CCACHE=OFF
30CMAKE_ARGS+= -DOPENCV_GENERATE_SETUPVARS=OFF 30CMAKE_ARGS+= -DOPENCV_GENERATE_SETUPVARS=OFF
31CMAKE_ARGS+= -DPROTOBUF_UPDATE_FILES=ON 31CMAKE_ARGS+= -DPROTOBUF_UPDATE_FILES=ON
32CMAKE_ARGS+= -DWITH_EIGEN=OFF 32CMAKE_ARGS+= -DWITH_EIGEN=OFF
33CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib} 33CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
34CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=OFF 34CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=OFF
35CMAKE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON 35CMAKE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON
36 36
 37.include "../../mk/bsd.prefs.mk"
 38
 39.if ${MACHINE_ARCH} == "i386"
 40# Disable SSE/SSE2 to avoid build errors from missing _mm_pause.
 41CMAKE_ARGS+= -DCPU_BASELINE=""
 42.endif
 43
37PYTHON_VERSIONS_INCOMPATIBLE= 27 # avoid Python 2.7 44PYTHON_VERSIONS_INCOMPATIBLE= 27 # avoid Python 2.7
38 45
39pre-configure: 46pre-configure:
40 ${MKDIR} ${WRKSRC}/build 47 ${MKDIR} ${WRKSRC}/build
41 48
 49.include "../../mk/atomic64.mk"
42.include "../../lang/python/pyversion.mk" 50.include "../../lang/python/pyversion.mk"