Date: Fri, 10 Jan 2020 04:35:04 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522553 - head/science/vipster Message-ID: <202001100435.00A4Z43G055833@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Fri Jan 10 04:35:04 2020 New Revision: 522553 URL: https://svnweb.freebsd.org/changeset/ports/522553 Log: science/vipster: Fix build on gcc-based architectures by setting compiler properly The instruction in https://wiki.freebsd.org/HardcodedCCVersions recommending to use -DLLVM_CONFIG_EXECUTABLE for cmake-based ports turned out to be wrong for vipster, it doesn't work. The way how is done now works fine. Reported by: pkubaj Modified: head/science/vipster/Makefile Modified: head/science/vipster/Makefile ============================================================================== --- head/science/vipster/Makefile Fri Jan 10 03:05:58 2020 (r522552) +++ head/science/vipster/Makefile Fri Jan 10 04:35:04 2020 (r522553) @@ -13,7 +13,7 @@ COMMENT= Crystalline and molecular structure visualisa LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake +USES= cmake compiler USE_GITHUB= yes GH_ACCOUNT= sgsaenger USE_LDCONFIG= yes @@ -31,15 +31,23 @@ PYTHON_CMAKE_BOOL= PYTHON PYTHON_BROKEN= Bundles pybind11: https://github.com/sgsaenger/vipster/issues/23 # use clang from ports because older clang (clang-6) lacks the c++17 feature std::mmap::extract -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -CPP= clang-cpp${LLVM_DEFAULT} -CC= clang${LLVM_DEFAULT} -CXX= clang++${LLVM_DEFAULT} +.include <bsd.port.pre.mk> + +.if ${CHOSEN_COMPILER_TYPE} == clang +LLVM_VER= ${LLVM_DEFAULT} +BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} +CPP= clang-cpp${LLVM_VER} +CC= clang${LLVM_VER} +CXX= clang++${LLVM_VER} +.else +USE_GCC= yes +.endif + do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DTESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001100435.00A4Z43G055833>