From owner-svn-ports-head@freebsd.org  Mon Jan 13 10:38:34 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id A47C41FEDF4;
 Mon, 13 Jan 2020 10:38:34 +0000 (UTC)
 (envelope-from pkubaj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47x96f40ZDz4Jp6;
 Mon, 13 Jan 2020 10:38:34 +0000 (UTC)
 (envelope-from pkubaj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8475E31AB;
 Mon, 13 Jan 2020 10:38:34 +0000 (UTC)
 (envelope-from pkubaj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00DAcYI9026330;
 Mon, 13 Jan 2020 10:38:34 GMT (envelope-from pkubaj@FreeBSD.org)
Received: (from pkubaj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00DAcY5F026329;
 Mon, 13 Jan 2020 10:38:34 GMT (envelope-from pkubaj@FreeBSD.org)
Message-Id: <202001131038.00DAcY5F026329@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to
 pkubaj@FreeBSD.org using -f
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Date: Mon, 13 Jan 2020 10:38:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r522877 - head/misc/mnn
X-SVN-Group: ports-head
X-SVN-Commit-Author: pkubaj
X-SVN-Commit-Paths: head/misc/mnn
X-SVN-Commit-Revision: 522877
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jan 2020 10:38:34 -0000

Author: pkubaj
Date: Mon Jan 13 10:38:34 2020
New Revision: 522877
URL: https://svnweb.freebsd.org/changeset/ports/522877

Log:
  misc/mnn: fix build on non-x86
  
  Disable AVX and SSE on non-x86 architectures.
  
  PR:		243303
  Approved by:	yuri (maintainer)

Modified:
  head/misc/mnn/Makefile

Modified: head/misc/mnn/Makefile
==============================================================================
--- head/misc/mnn/Makefile	Mon Jan 13 10:26:46 2020	(r522876)
+++ head/misc/mnn/Makefile	Mon Jan 13 10:38:34 2020	(r522877)
@@ -26,10 +26,17 @@ LDFLAGS+=	-pthread
 CFLAGS+=	-fPIC # workaround for https://github.com/alibaba/MNN/issues/553
 CXXFLAGS+=	-fPIC
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != amd64 && ${ARCH} != i386
+CMAKE_ARGS+=	-DMNN_USE_AVX:BOOL=OFF \
+		-DMNN_USE_SSE:BOOL=OFF
+.endif
+
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DMNN_BUILD_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		(cd ${BUILD_WRKSRC} && ./run_test.out)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>