Date: Sat, 23 May 2026 21:05:49 +0200 From: Dimitry Andric <dim@FreeBSD.org> To: Slawa Olhovchenkov <slw@zxy.spb.ru> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 700637cbb5e5 - main - Merge llvm-project main llvmorg-21-init-19288-gface93e724f4 Message-ID: <55025A7D-FB49-4E82-89C5-656598CBF71D@FreeBSD.org> In-Reply-To: <20260523142311.GA2758@zxy.spb.ru> References: <69eccd4e.36ab8.fd16100@gitrepo.freebsd.org> <20260522163423.GA39748@zxy.spb.ru> <4C91123F-5F4A-4ED0-B798-E474B8E219A2@FreeBSD.org> <20260523142311.GA2758@zxy.spb.ru>
index | next in thread | previous in thread | raw e-mail
On 23 May 2026, at 16:23, Slawa Olhovchenkov <slw@zxy.spb.ru> wrote: > > On Fri, May 22, 2026 at 11:47:01PM +0200, Dimitry Andric wrote: >> On 22 May 2026, at 18:34, Slawa Olhovchenkov <slw@zxy.spb.ru> wrote: >>> >>> On Sat, Apr 25, 2026 at 02:18:54PM +0000, Dimitry Andric wrote: >>> >>>> The branch main has been updated by dim: >>>> >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=700637cbb5e582861067a11aaca4d053546871d2 >>>> >>>> commit 700637cbb5e582861067a11aaca4d053546871d2 >>>> Merge: 6243d755fb82 3f709e42e3be >>>> Author: Dimitry Andric <dim@FreeBSD.org> >>>> AuthorDate: 2025-12-07 15:15:22 +0000 >>>> Commit: Dimitry Andric <dim@FreeBSD.org> >>>> CommitDate: 2026-04-25 14:08:55 +0000 >>>> >>>> Merge llvm-project main llvmorg-21-init-19288-gface93e724f4 >>>> >>>> This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and >>>> openmp to llvm-project main llvmorg-21-init-19288-gface93e724f4, the >>>> last commit before the upstream release/21.x branch was created. >>>> >>>> PR: 292067 >>>> MFC after: 1 month >>> >>> This is broke at least graphics/krita >>> I mean __type_traits/is_integral.h is incorrect now: template <class >>> _Tp> struct __libcpp_is_integral defined only for >>> !__has_builtin(__is_integral) >> >> Please try the patch in <https://bugs.freebsd.org/295509>. > > Failed > % ls -l /poudriere/ports/default/graphics/krita/files/ > total 6 > -rw-r--r-- 1 root wheel 525 Mar 10 2025 patch-cmake_modules_FindOpenJPEG.cmake > -rw-r--r-- 1 root wheel 384 Mar 10 2025 patch-cmake_modules_pyproject.toml.in > -rw-r--r-- 1 root wheel 2842 May 23 17:13 patch-libs_global_KisHalfTraits.h > -rw-r--r-- 1 root wheel 639 Mar 10 2025 patch-plugins_impex_CMakeLists.txt > > > In file included from /wrkdirs/usr/ports/graphics/krita/work/krita-5.2.14/libs/pigment/KoColor.cpp:9: > In file included from /wrkdirs/usr/ports/graphics/krita/work/krita-5.2.14/libs/pigment/KoColor.h:16: > In file included from /wrkdirs/usr/ports/graphics/krita/work/krita-5.2.14/libs/pigment/KoColorSpaceTraits.h:14: > In file included from /wrkdirs/usr/ports/graphics/krita/work/krita-5.2.14/libs/pigment/KoColorSpaceMaths.h:109: > /wrkdirs/usr/ports/graphics/krita/work/krita-5.2.14/libs/global/KisHalfTraits.h:33:10: error: no template named '__libcpp_is_integral'; did you mean '__libcpp_is_final'? > 33 | struct __libcpp_is_integral<half> > | ^~~~~~~~~~~~~~~~~~~~ > | __libcpp_is_final Strange, it builds just fine for me. Can you post the /wrkdirs/usr/ports/graphics/krita/work/krita-5.2.14/libs/global/KisHalfTraits.h file? -Dimitryhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?55025A7D-FB49-4E82-89C5-656598CBF71D>