Date: Sat, 30 Nov 2019 02:42:10 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518698 - head/devel/dmlc-core Message-ID: <201911300242.xAU2gAVY036831@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Sat Nov 30 02:42:10 2019 New Revision: 518698 URL: https://svnweb.freebsd.org/changeset/ports/518698 Log: devel/dmlc-core: use LLVM on LLVM architectures Use LLVM on LLVM architectures to avoid mixing C++ libraries. Add USES=compiler:c++11-lang to force new GCC on GCC architectures (the port requires C++11 anyway). Also add ? to toolchain setup to allow switching to GCC binaries. Reported by: jbeich Approved by: mentors (implicit approval) Modified: head/devel/dmlc-core/Makefile Modified: head/devel/dmlc-core/Makefile ============================================================================== --- head/devel/dmlc-core/Makefile Sat Nov 30 02:37:58 2019 (r518697) +++ head/devel/dmlc-core/Makefile Sat Nov 30 02:42:10 2019 (r518698) @@ -4,7 +4,7 @@ PORTNAME= dmlc-core DISTVERSIONPREFIX= v DISTVERSION= 0.3-105 DISTVERSIONSUFFIX= -g32d9fe7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -12,17 +12,24 @@ COMMENT= Common library for scalable and portable dist LICENSE= APACHE20 -USES= compiler:openmp cmake +BUILD_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} + +USES= cmake compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= dmlc USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS -.include <bsd.port.pre.mk> +# use clang from ports because otherwise OpenMP isn't detected on some systems (ex. 12.0-RELEASE-p9) +CPP?= clang-cpp${LLVM_DEFAULT} +CC?= clang${LLVM_DEFAULT} +CXX?= clang++${LLVM_DEFAULT} -.if ${CHOSEN_COMPILER_TYPE} == gcc -USE_GCC= yes +.include <bsd.port.options.mk> + +.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +LLVM_DEFAULT= 80 .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911300242.xAU2gAVY036831>