Date: Sun, 25 Jun 2023 18:44:27 GMT From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 16d1806c2683 - main - devel/cbang: uses clang 15 instead of clang 16 Message-ID: <202306251844.35PIiR8q057422@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=16d1806c26831cf957741d530f0738404e223635 commit 16d1806c26831cf957741d530f0738404e223635 Author: Thierry Thomas <thierry@FreeBSD.org> AuthorDate: 2023-06-25 18:41:24 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2023-06-25 18:44:23 +0000 devel/cbang: uses clang 15 instead of clang 16 See <https://github.com/CauldronDevelopmentLLC/cbang/issues/119>; for details. PR: 271047 Reported by: pkg-fallout --- devel/cbang/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/devel/cbang/Makefile b/devel/cbang/Makefile index 930b020fa60f..366723807e85 100644 --- a/devel/cbang/Makefile +++ b/devel/cbang/Makefile @@ -25,6 +25,7 @@ GH_ACCOUNT= CauldronDevelopmentLLC USES= compiler:c++17-lang localbase mysql:client python:test scons \ sqlite ssl +USE_CXXSTD= gnu++17 USE_LDCONFIG= yes OPTIONS_DEFINE= DEBUG DOCS @@ -33,7 +34,6 @@ DEBUG_LIB_DEPENDS= libbfd.so:devel/libbfd MAKE_ARGS+= cc="${CC}" \ cxx="${CXX}" \ - cxxstd="c++17" \ ccflags="${CCFLAGS}" \ cxxflags="${CXXFLAGS}" \ libpath="/lib" \ @@ -51,6 +51,16 @@ PLIST_SUB= VER=${LIBVER} TEST_WRKSRC= ${WRKSRC}/tests DO_MAKE_TEST= ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_ARGS} +.include <bsd.port.pre.mk> + +.if ${COMPILER_VERSION} >= 160 +# See https://github.com/CauldronDevelopmentLLC/cbang/issues/119 +BUILD_DEPENDS+= clang15:devel/llvm15 +CPP= clang-cpp15 +CC= clang15 +CXX= clang++15 +.endif + pre-configure: ${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \ ${TEST_WRKSRC}/testHarness @@ -72,4 +82,4 @@ post-install: do-test: (cd ${TEST_WRKSRC} && ${DO_MAKE_TEST} && ./testHarness) -.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?202306251844.35PIiR8q057422>