Received: by mail.netbsd.org (Postfix, from userid 605) id A933584F3B; Fri, 10 Sep 2021 12:09:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E478684D7A for ; Fri, 10 Sep 2021 12:09:27 +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 dRWIhYPdCYeR for ; Fri, 10 Sep 2021 12:09:27 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 354DC84D66 for ; Fri, 10 Sep 2021 12:09:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 32BC1FA97; Fri, 10 Sep 2021 12:09:27 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1631275767264780" MIME-Version: 1.0 Date: Fri, 10 Sep 2021 12:09:27 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/graphics/opencv To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210910120927.32BC1FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1631275767264780 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1631275767264780 Content-Disposition: inline Content-Length: 1061 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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" --_----------=_1631275767264780--