Attachment 249504 Details for Bug 277856 – Updated patch file

[patch] Updated patch file

devel_boost-all.patch (text/plain), 2.98 KB, created by Yasuhiro Kimura on 2024-03-27 07:12:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2024-03-27 07:12:17 UTC

Size: 2.98 KB

patch

obsolete

>From ccedd67986b6e6b52c06b3758a296d5223f9bd30 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@utahime.org>
>Date: Wed, 27 Mar 2024 16:07:58 +0900
>Subject: [PATCH] devel/boost-all: Adjust range to use llvm from ports
>
>The reason to use llvm from ports is that there is bug in clang of
>base system that causes assertion failure while building
>devel/boost-libs. The bug is already fixed with main, stable/14 and
>stable/13 branches of src repository. So we need to use llvm from
>ports only with following conditions.
>
>1. 1500000 <= OSVERSION < 1500017
>2. 1400000 <= OSVERSION < 1400509
>3. 1300000 <= OSVERSION < 1303502
>
>And commit 3b8c51bd37b0 adjusts the range as above.
>
>But there is a pitfall about it. The assertion failure happens only if
>base system is built with WITH_LLVM_ASSERTIONS enabled. By default the
>option is enabled with main branch but is disabled with stable/* and
>releng/* ones. So the failure happens with -CURRENT even if it is
>built with default options settings but doesn't with -STABLE and
>-RELEASE unless it is built with WITH_LLVM_ASSERTIONS enabled. IMHO
>majority of FreeBSD users use -RELEASE, and seldom -STABLE user
>enables WITH_LLVM_ASSERTIONS. As a result adjustment with commit
>3b8c51bd37b0 forces -RELEASE and -STABLE users to build llvm port that
>is unnecessary to build devel/boost-libs.
>
>So adjust the range so llvm from ports is used by default only if base
>system is -CURRENT with the assertion failure unfixed. And as a last
>resort for -STABLE and -RELEASE users who enable WITH_LLVM_ASSERTIONS
>add LLVM_FROM_PORTS option to devel/boost-libs that forces to use llvm
>from ports.
>---
> devel/boost-all/compiled.mk | 4 ++--
> devel/boost-libs/Makefile   | 3 ++-
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/devel/boost-all/compiled.mk b/devel/boost-all/compiled.mk
>index 6062ce1d7666..e55ae3eb32d4 100644
>--- a/devel/boost-all/compiled.mk
>+++ b/devel/boost-all/compiled.mk
>@@ -45,8 +45,8 @@ MAKE_ARGS+=	pch=off
> 
> .if ${OPSYS} == FreeBSD && \
> 	((${OSVERSION} >= 1500000 && ${OSVERSION} < 1500017) || \
>-	(${OSVERSION} >= 1400000 && ${OSVERSION} < 1400509) || \
>-	(${OSVERSION} >= 1300000 && ${OSVERSION} < 1303502))
>+	(${OSVERSION} >= 1400000 && ${OSVERSION} < 1400097)|| \
>+	${PORT_OPTIONS:MLLVM_FROM_PORTS})
> USES+=	llvm:build
> CHOSEN_COMPILER_TYPE=	clang
> .else
>diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile
>index 5ce2aa66d57f..31add4af97d0 100644
>--- a/devel/boost-libs/Makefile
>+++ b/devel/boost-libs/Makefile
>@@ -11,12 +11,13 @@ BROKEN_sparc64=	https://github.com/boostorg/context/commit/f2ef6326b6ed
> 
> BUILD_DEPENDS+=	bjam:devel/boost-jam
> 
>-OPTIONS_DEFINE=		DEBUG OPTIMIZED_CFLAGS
>+OPTIONS_DEFINE=		DEBUG LLVM_FROM_PORTS OPTIMIZED_CFLAGS
> OPTIONS_MULTI=		LOCALE
> OPTIONS_MULTI_LOCALE=	ICONV ICU
> OPTIONS_DEFAULT=	ICONV ICU
> ICONV_DESC=		Boost.Locale with iconv encoding support
> ICU_DESC=		Boost.Regex/Locale with ICU unicode support
>+LLVM_FROM_PORTS_DESC=	Use LLVM from ports to build
> 
> ICONV_USES=		iconv
> ICONV_MAKE_ARGS=	-sICONV_PATH=${ICONV_PREFIX}
>-- 
>2.44.0
>

Flags:

yasu: maintainer-approval? (office)

Actions: View | Diff

Attachments on bug 277856: 249361 | 249504