Date: Tue, 29 Aug 2023 03:17:43 GMT From: Yasuhiro Kimura <yasu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: badc87250b6f - 2023Q3 - devel/boost-all: Adjust range to use llvm from ports Message-ID: <202308290317.37T3HhnW044439@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q3 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=badc87250b6f2cfa3d5bee7da8f78a6b641b747b commit badc87250b6f2cfa3d5bee7da8f78a6b641b747b Author: Yasuhiro Kimura <yasu@FreeBSD.org> AuthorDate: 2023-08-25 01:28:10 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> CommitDate: 2023-08-29 03:16:39 +0000 devel/boost-all: Adjust range to use llvm from ports When boost was updated to 1.81.0, the problem was reported as PR 269067 that build of devel/boost-libs fails because of assertion failure of Clang in base system. According to the comment submitted to upstream issue tracker (*), the source of the problem is very long standing bug of LLVM/Clang. So the bug itself is included in all of supported branch of src repository. But the problem only happens with main because assertion is only enabled with it. To work it around compiled.mk was modified so llvm from ports is used instead of that of base system when __FreeBSD_version is 1400000 or later. This is what was done with commit 3efdfab9b59f. And recently stable/14 branch is created in src repository. After it is created __FreeBSD_version of the branch is bumped from 1400096 to 1400097. And the value of main is bumped from 1400096 to 1500000. So adjust range to use llvm from ports as following. Case 1: 1400000 <= OSVERSION < 1400097 (main before stable/14 is branched) Case 2: OSVERSION >= 1500000 (main after stable/14 is branched) Reference: https://github.com/llvm/llvm-project/issues/39319#issuecomment-1444452238 (*) PR: 273335 Approved by: sunpoet (office@, maintainer) MFH: 2023Q3 (cherry picked from commit 9b2e4b0219bd4814b47c22e5901f3b1cc091fded) --- devel/boost-all/compiled.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devel/boost-all/compiled.mk b/devel/boost-all/compiled.mk index 3783dd5d74c5..c28fc60aeb7f 100644 --- a/devel/boost-all/compiled.mk +++ b/devel/boost-all/compiled.mk @@ -43,7 +43,8 @@ MAKE_ARGS+= pch=off .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000 +.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1500000 || \ + (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400097)) USES+= llvm:build CC= ${_LLVM_MK_PREFIX}/bin/clang CPP= ${_LLVM_MK_PREFIX}/bin/clang-cpp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308290317.37T3HhnW044439>