cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This port needs a newer GCC to build, so add USES=compiler:c++11-lang

Browse Source 
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
This commit is contained in:
Mark Linimon 2018-12-22 01:18:31 +00:00
parent ba75550afc
commit 221c723cb2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=488038
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
science/py-dlib/Makefile
View File

@ -20,7 +20,8 @@ BROKEN_armv7= fails to build: CMake Error at test_for_avx/CMakeLists.txt:17 (if
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