From owner-svn-ports-all@freebsd.org Sat Dec 22 01:18:32 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A2EA133BC6B; Sat, 22 Dec 2018 01:18:32 +0000 (UTC) (envelope-from linimon@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 314F08D82F; Sat, 22 Dec 2018 01:18:32 +0000 (UTC) (envelope-from linimon@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 22AAD1DA03; Sat, 22 Dec 2018 01:18:32 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBM1IWVW063097; Sat, 22 Dec 2018 01:18:32 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBM1IWTd063096; Sat, 22 Dec 2018 01:18:32 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201812220118.wBM1IWTd063096@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Sat, 22 Dec 2018 01:18:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488038 - head/science/py-dlib X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: head/science/py-dlib X-SVN-Commit-Revision: 488038 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 314F08D82F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Dec 2018 01:18:32 -0000 Author: linimon Date: Sat Dec 22 01:18:31 2018 New Revision: 488038 URL: https://svnweb.freebsd.org/changeset/ports/488038 Log: This port needs a newer GCC to build, so add USES=compiler:c++11-lang to fix build on GCC-based architectures. Additionally, it tests for AVX support even if AVX option is off, which breaks the build. Explicitly disable AVX when AVX option is off. Since avxargs is used by BLASLAPACK option, rename their avxags to blaslapackargs. While here, pet portlint (whitespace). PR: 234179 Submitted by: Piotr Kubaj Approved by: maintainer Modified: head/science/py-dlib/Makefile Modified: head/science/py-dlib/Makefile ============================================================================== --- head/science/py-dlib/Makefile Sat Dec 22 01:13:16 2018 (r488037) +++ head/science/py-dlib/Makefile Sat Dec 22 01:18:31 2018 (r488038) @@ -20,7 +20,8 @@ BROKEN_armv7= fails to build: CMake Error at test_for BUILD_DEPENDS= cmake:devel/cmake LIB_DEPENDS= ${PY_BOOST} -USES= pkgconfig python shebangfix tar:bzip2 +USES= compiler:c++11-lang pkgconfig python shebangfix \ + tar:bzip2 USE_PYTHON= autoplist distutils SHEBANG_FILES= python_examples/*.py @@ -50,11 +51,12 @@ SQLITE_VARS= sqliteargs="--yes DLIB_LINK_WITH_SQLITE3 SQLITE_VARS_OFF= sqliteargs="--no DLIB_LINK_WITH_SQLITE3" BLASLAPACK_USES= blaslapack -BLASLAPACK_VARS_OFF= avxargs="--no DLIB_USE_BLAS --no DLIB_USE_LAPACK --no DLIB_USE_MKL_FFT" +BLASLAPACK_VARS_OFF= blaslapackargs="--no DLIB_USE_BLAS --no DLIB_USE_LAPACK --no DLIB_USE_MKL_FFT" AVX_VARS= avxargs="--yes USE_AVX_INSTRUCTIONS" +AVX_VARS_OFF= avxargs="--no AVX_IS_AVAILABLE_ON_HOST" -PYDISTUTILS_BUILDARGS= --set BOOST_PYTHON_SUFFIX:STRING=${PYTHON_SUFFIX} ${X11ARGS} ${JPEGARGS} ${PNGARGS} ${GIFARGS} ${SQLITEARGS} ${BLASLAPACKARGS} ${AVXARGS} +PYDISTUTILS_BUILDARGS= --set BOOST_PYTHON_SUFFIX:STRING=${PYTHON_SUFFIX} ${X11ARGS} ${JPEGARGS} ${PNGARGS} ${GIFARGS} ${SQLITEARGS} ${BLASLAPACKARGS} ${AVXARGS} ${BLASLAPACK} post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/dlib.so