From nobody Mon May 25 12:31:45 2026 X-Original-To: dev-commits-src-all@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 4gPFcn4pJ9z6fKNH; Mon, 25 May 2026 12:31:53 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4gPFcn1T98z3QRy; Mon, 25 May 2026 12:31:53 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zxy.spb.ru; s=dkim; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date; bh=rBLsK4sgx++6h0ovlkQma4WDgBHqKU9x9PzXcMnt8lE=; b=q tSotRzj1stP2gIbtKOj3z2MOjTKiIRB6BDltCSF7gAFGJQ5DlBZIGuK/LZbTsKlrdyhIAdnFI7nm4 jjRa8t2T2bDy3BiqsGBp2O8IshjNERz7A/zU4TMdnVLNk+8hgD+Z2P7BpDcuFi0ECy86mfik1IEb2 ILeyfY/TsVyEaQ3R7x/GRdVfm9Um/QeOeVTb6Nyadwq30SoML9CIgJFKFMAPQpdoO54CCI6kXha0d EJuyVE627/0U8S6In19T9V1OGAbRfo8MIs0lP3mi/Dg0PJFV6nrvZAwh05w7MR5mldLZc/hBOqRx/ pSQexcIGmZ8m9pkcH191jEVEkTcf6gWAQ==; Received: from slw by zxy.spb.ru with local (Exim 4.86 (FreeBSD)) (envelope-from ) id 1wRUTB-0007HX-Ag; Mon, 25 May 2026 15:31:45 +0300 Date: Mon, 25 May 2026 15:31:45 +0300 From: Slawa Olhovchenkov To: Dimitry Andric Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 700637cbb5e5 - main - Merge llvm-project main llvmorg-21-init-19288-gface93e724f4 Message-ID: <20260525123145.GB2758@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> <55025A7D-FB49-4E82-89C5-656598CBF71D@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55025A7D-FB49-4E82-89C5-656598CBF71D@FreeBSD.org> User-Agent: Mutt/1.5.24 (2015-08-30) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:5495, ipnet:195.70.192.0/19, country:RU] X-Rspamd-Queue-Id: 4gPFcn1T98z3QRy X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On Sat, May 23, 2026 at 09:05:49PM +0200, Dimitry Andric wrote: > On 23 May 2026, at 16:23, Slawa Olhovchenkov wrote: > > > > On Fri, May 22, 2026 at 11:47:01PM +0200, Dimitry Andric wrote: > >> On 22 May 2026, at 18:34, Slawa Olhovchenkov 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 > >>>> AuthorDate: 2025-12-07 15:15:22 +0000 > >>>> Commit: Dimitry Andric > >>>> 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 >>> _Tp> struct __libcpp_is_integral defined only for > >>> !__has_builtin(__is_integral) > >> > >> Please try the patch in . > > > > 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 > > | ^~~~~~~~~~~~~~~~~~~~ > > | __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? > I mean path problems in patch file: # find /wrkdirs/usr/ports/graphics/krita/work/ -name "*KisHalfTraits.h*" -ls 36581 2 -rw-r--r-- 1 root wheel 430 May 25 12:23 /wrkdirs/usr/ports/graphics/krita/work/krita-5.2.14/b/graphics/krita/files/patch-libs_global_KisHalfTraits.h 36589 1 -rw-r--r-- 1 root wheel 0 May 25 12:23 /wrkdirs/usr/ports/graphics/krita/work/krita-5.2.14/b/graphics/krita/files/patch-libs_global_KisHalfTraits.h.orig 37924 3 -rw-r--r-- 1 root wheel 1283 Dec 9 09:55 /wrkdirs/usr/ports/graphics/krita/work/krita-5.2.14/libs/global/KisHalfTraits.h