svn commit: r488038 - head/science/py-dlib
Mark Linimon
linimon at FreeBSD.org
Sat Dec 22 01:18:32 UTC 2018
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
More information about the svn-ports-head
mailing list