From nobody Sun Apr 21 01:18:14 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMVr64vGMz5H593; Sun, 21 Apr 2024 01:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VMVr63tlpz4td0; Sun, 21 Apr 2024 01:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713662294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oRk0KVux9ifMHZTA3Ih80OnPozKwfUT6EXqaEhjXVvk=; b=wFVTFo/rEFxE43zH/ET61akeeP/V+c/NEYjW5z2gX16lbKirhSwrGnHGTvqKJBbl9cxz4l hGB2zRuHu+DA/tcWgXaLTOG+9UGQDJ+3hIpgtUWAvwOH3D5rPbGUsaLrNn5UxQbPKBkJAm 0LTqTSj11SqeUjVKAUolTz6FmGy5OL6iZmLrj5DktbV8ovCZTJaL/zLCxEdcMNbs7rkD/w au/8vCPpcgUYZ/IHVMq0o74yALgpoJbfX6R25GNbN7Y1fV6CdRY+nMp9Q8D3+1p85POgqM aRzIUKbqghChUGw6K4YEa7gtuU1hfjWsEujgA3/W/RSG6ksXC+vgM+tOjFCoJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713662294; a=rsa-sha256; cv=none; b=VOVyXdn6vt25/kFA9p2OyIAK4pZ6Rd4RwH8FhmyC8pm2PIhzb/A/Naz0FCm/4KRjKcp15Z YBgpLNWGiDwSvQSf2lHIXqHgvi/mbcmd4TqbUfzjgqAQ/lbAbsXCnwof9ewKM1WRU547oE D9T67S4rT7EGxR8LoJVCO3F7I1ef1k4RX99q0v4V2CVMK8IIQYiXTo5UtSPhG4ND44C9aO 9eMp5ETGPpkTE+HXmQmuc5yTzPd14NVj6G/DRp3Jp0By5pawtdrgN3F6oRgo59CSQgcpLN qJMJMjR31Zlz88u9kgQ4CZEfwTbSSt2zlnvexfAI+dltrMuIwKbKwtOCFt82pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713662294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oRk0KVux9ifMHZTA3Ih80OnPozKwfUT6EXqaEhjXVvk=; b=MqjOqmvVSt9V6dVY/t+M0A44Wq+/ooAW+bPwdjFPY/Q4W3LowWh9Kufb3LyoPGvYIGdceZ 1bvE+dRqCwqIAJsAhbzaozyzy90+f0SyTJdTjl3cqyvHcK3Dt3DP2BUP06wWJVPRDSxy/p t3FTVgMLQtAc/hd73bbEBM4dJyTiyXFwBqMz02sMM2INhpm6pbhLt4V5GPVKlRGE2LeGlV 8DXeq9unkivL5vbzFhGZ5idBX5/EFjgpOpZMKEtObscbbeU+LPgMuHWIrnT1hnLrhDGk5f rA4ZnAui+fOvTz2MRoiDSaLhUrDSJazEsNekad+YLtXhxk5UibbIrSe/j330lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMVr63V2Zz108v; Sun, 21 Apr 2024 01:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43L1IEv7011648; Sun, 21 Apr 2024 01:18:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43L1IETc011645; Sun, 21 Apr 2024 01:18:14 GMT (envelope-from git) Date: Sun, 21 Apr 2024 01:18:14 GMT Message-Id: <202404210118.43L1IETc011645@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: c4eb9478257e - main - devel/boost-{all,libs}: Adjust range of OSVERSION to use LLVM from ports List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4eb9478257e33a0e2c9de216fe4503127f3abef Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=c4eb9478257e33a0e2c9de216fe4503127f3abef commit c4eb9478257e33a0e2c9de216fe4503127f3abef Author: Yasuhiro Kimura AuthorDate: 2024-04-21 01:14:18 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-04-21 01:14:18 +0000 devel/boost-{all,libs}: Adjust range of OSVERSION to use LLVM from ports The reason to use LLVM from ports is that there is bug in Clang/LLVM 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 ranges of OSVERSION. 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 variable set. By default it is set with main branch but not with stable/* and releng/* ones. So wheareas the failure happens with -CURRENT even if it is built with default variables settings, it doesn't happen with -STABLE and -RELEASE unless they are built with WITH_LLVM_ASSERTIONS set. IMHO majority of FreeBSD users use -RELEASE with official binary, and few -STABLE users set WITH_LLVM_ASSERTIONS. As a result adjustment with commit 3b8c51bd37b0 forces most -RELEASE and -STABLE users to build LLVM port unnecessarily. 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 set WITH_LLVM_ASSERTIONS, add LLVM_FROM_PORTS option to devel/boost-libs that forces to use LLVM from ports. PR: 277856 Approved by: maintainer timeout --- devel/boost-all/compiled.mk | 5 +++-- devel/boost-libs/Makefile | 24 +++++++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/devel/boost-all/compiled.mk b/devel/boost-all/compiled.mk index 6062ce1d7666..c81c2a006e58 100644 --- a/devel/boost-all/compiled.mk +++ b/devel/boost-all/compiled.mk @@ -45,8 +45,9 @@ MAKE_ARGS+= pch=off .if ${OPSYS} == FreeBSD && \ ((${OSVERSION} >= 1500000 && ${OSVERSION} < 1500017) || \ - (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400509) || \ - (${OSVERSION} >= 1300000 && ${OSVERSION} < 1303502)) + (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400097)|| \ + (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300137) || \ + ${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..34abe110d84d 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -11,12 +11,34 @@ BROKEN_sparc64= https://github.com/boostorg/context/commit/f2ef6326b6ed BUILD_DEPENDS+= bjam:devel/boost-jam -OPTIONS_DEFINE= DEBUG OPTIMIZED_CFLAGS +# Note about LLVM_FROM_PORTS option: +# Build of this port fails with assertion failure of compiler due to +# bug of LLVM/Clang in base system. The failure happens when all of +# following conditions are satisfied. +# * OSVERSION is included in either of following ranges. +# 1. 1500000 <= OSVERSION < 1500017 +# 2. 1400000 <= OSVERSION < 1400509 +# 3. 1300000 <= OSVERSION < 1303502 +# * Base system is built with WITH_LLVM_ASSERTIONS variable set. +# So if your base system fulfills them you need to use LLVM ports to +# build this port. +# By default WITH_LLVM_ASSERTIONS variable is set with -CURRENT but +# not with -STABLE and -RELEASE. So whereas most -CURRENT users face +# the build failure, few -STABLE and -RELEASE user faces it. +# Therefore by default this port uses LLVM from ports only if base +# system is -CURRENT and OSVERSION is included in above ranges. It +# make it possible for most -STABLE and -RELEASE users to avoid to +# build LLVM ports unnecessarily. But if someone uses -STABLE or +# -RELEASE built with WITH_LLVM_ASSERTIONS set, then he can't build +# this port successfully on such system. So provide LLVM_FROM_PORTS +# option as a last resort for him. +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}