CVS commit: pkgsrc/graphics/opencv

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Sep 10 12:09:27 UTC 2021

Modified Files:
        pkgsrc/graphics/opencv: Makefile.common

Log Message:
opencv: Fix building on i386


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/opencv/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/opencv/Makefile.common
diff -u pkgsrc/graphics/opencv/Makefile.common:1.6 pkgsrc/graphics/opencv/Makefile.common:1.7
--- pkgsrc/graphics/opencv/Makefile.common:1.6  Sun Aug 16 22:18:49 2020
+++ pkgsrc/graphics/opencv/Makefile.common      Fri Sep 10 12:09:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2020/08/16 22:18:49 tnn Exp $
+# $NetBSD: Makefile.common,v 1.7 2021/09/10 12:09:27 nia Exp $
 # used by graphics/opencv/Makefile
 # used by graphics/opencv-contrib-face/Makefile
 #
@@ -34,9 +34,17 @@ CMAKE_ARGS+=         -DZLIB_ROOT=${BUILDLINK_PR
 CMAKE_ARGS.SunOS+=     -DENABLE_PRECOMPILED_HEADERS=OFF
 CMAKE_ARGS.SunOS+=     -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == "i386"
+# Disable SSE/SSE2 to avoid build errors from missing _mm_pause.
+CMAKE_ARGS+=           -DCPU_BASELINE=""
+.endif
+
 PYTHON_VERSIONS_INCOMPATIBLE=  27      # avoid Python 2.7
 
 pre-configure:
        ${MKDIR} ${WRKSRC}/build
 
+.include "../../mk/atomic64.mk"
 .include "../../lang/python/pyversion.mk"