From nobody Tue Dec 30 01:06:27 2025 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 4dgFKL12Pkz6Mbs9; Tue, 30 Dec 2025 01:06:30 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgFKL0M64z3Dx0; Tue, 30 Dec 2025 01:06:30 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767056790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GconGVcI4NGhBcp52vbLd2vnuN/lBh9HcTriwKQD+qM=; b=B0AQSSVW7TjOTW2vdyFjrc7tYd/XcEtcNzd1uBIT3gFn8yHXvAZ9ouuPoXsM7GVAmDdKX3 2bve/wKT/BducwECeRDTy3CWctQjzUGgnM6ilmWEL9Ksm+/Ju0KkV7Y3hf8yntcALdl3sQ A8avXwlMjTPcMueGyopoqyb8vt0Wu8S14UOpKFytUYU85O3xS0CLIdZJlZCRTluadSegJ4 uRwtfqYlpnhPn7gbpGuD2Nsq8SDsH984kqmC1Ge7pUvZk83O8o5sxKEbvIF8TvbcrSeJ3x k7+ZcgXiFgzzzcEx1VI6YddtCTZcoea/E4xPvfz220sGsn7WFeBWYFEd1ERVNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767056790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GconGVcI4NGhBcp52vbLd2vnuN/lBh9HcTriwKQD+qM=; b=j6F8NFYUdt3N6sT79Q1pPuR0Cdz9rXbQ+r3ompqMIs6g210/cM8dY6wcE8/6LvpyHOlpg6 BsKWdusne+ACtnQ4/19mjdUvW3UGWvjTIFLCn86j2nDbQugEbUDZ4IIH8/m2TE0pZYbMw3 Y3XsyZMpeG5qE0MfKM96tiUtwbNwFqnqvy3E9CaFSsUH9QWj2VnvLBAdmer6dnkvaNlCV4 hJBvkS/6zBKfsCzI3XUjHkZNGD5txOif5WuwsBBDVkLYW85GCUWIH1d/FX6S+wG0t8qHfP 3nRSl/1hfeMRsyc+mj38uGOrl7CtDOSPM98lP/2AOQnfXiHyAMxZy0k4vohb+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767056790; a=rsa-sha256; cv=none; b=SsDs/3PQFrQsRaSIgVsQZgr61T0plMJca82zXQhaDetMNE12ysbTcCNbL9IV2N0vVkZ7gI BRX2SRl3x43vhHTZ3sYa3GMsEkNoseGicTg0iSl14m2AFRpagwMcwgFyxl0eLpD3zm/r1Y UTKHCTVq+eP7VfAASlQ+QiBpwt0w9hMit+mhWfxTeILNnP+8NaO7T35f9t3jeDi2LeL11x 72i+u5n47soMp4KLympst5+Uf3W2dKoVbh1L/VytxTsliSIldFRZjHcfmfPUKds4m0CvYn ajCkBitUeQ3FDr8foHeyfHt+VoIyRIN2Zr3lXEEzlqpBzn0cOd+ihaceyQGSOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E7" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dgFKK5y5czs3s; Tue, 30 Dec 2025 01:06:29 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id A25EC5B781; Tue, 30 Dec 2025 02:06:27 +0100 (CET) Content-Type: text/plain; charset=us-ascii 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 Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.4\)) Subject: Re: git: 2ade7285253f - stable/14 - tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it From: Dimitry Andric In-Reply-To: Date: Tue, 30 Dec 2025 02:06:27 +0100 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <69527170.31d92.5af51114@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: Apple Mail (2.3826.700.81.1.4) On 29 Dec 2025, at 22:21, Dimitry Andric wrote: >=20 > On 29 Dec 2025, at 21:58, Mark Johnston wrote: >>=20 >> On Mon, Dec 29, 2025 at 12:17:52PM +0000, Dimitry Andric wrote: >>> The branch stable/14 has been updated by dim: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2ade7285253fc5dfe0adfc51f7bd342b= 9293f253 >>>=20 >>> commit 2ade7285253fc5dfe0adfc51f7bd342b9293f253 >>> Author: Dimitry Andric >>> AuthorDate: 2025-12-26 15:26:13 +0000 >>> Commit: Dimitry Andric >>> CommitDate: 2025-12-29 12:16:00 +0000 >>>=20 >>> tools.build: add sys/cdefs.h to SYSINCS, since lots of other = headers use it >>>=20 >>> This is needed to let the legacy stage compile against newer = versions of >>> sys/font.h, which transitively includes sys/cdefs.h, and requires = the >>> new __nonstring macro from it. >>>=20 >>> Fixes: e2c93ed09f25 >>> MFC after: 3 days >>>=20 >>> (cherry picked from commit = 1c9ff80f06350fa44b7e50ce09ad665ab0082abb) >>=20 >> Hi Dimitry, >>=20 >> After this commit, I can't build stable/14 on main (commit = 88b04633c29e >> to be exact) anymore. Here's the output from a buildworld, it fails >> pretty much immediately: >> https://reviews.freebsd.org/P683 >>=20 >> The same seems to be true on stable/13, but not on stable/15. >=20 > Hmm, this turns out to be a bit deeper rabbit hole than I anticipated. = The cdefs.h header on stable/14 and stable/13 are quite behind the one = on main and stable/15. This causes issues like the above, when = __noexcept, __deprecated1 and others are not defined during the legacy = stage, and it picks up _some_ headers from the host system, and others = from the location installed by tools/build/Makefile. >=20 > I think I will rollback the MFCs for now, until I can figure out a = solution. Ideally we would not have to copy cdefs.h for this bootstrap = part, but that leads to other issues. As an alternative solution, I have MFC'd support for __noexcept, = __deprecated, and __deprecated1 to stable/14 and stable/13, with a small = additional patch to stable/13. I believe both branches should now build = fine on main. -Dimitry