From nobody Mon Dec 29 12:18:08 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 4dfwGn18vSz6MCrm for ; Mon, 29 Dec 2025 12:18:09 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfwGm5pLdz3V1Z for ; Mon, 29 Dec 2025 12:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010688; 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; bh=SuF5cgTMnPjo0QPl/jEw0fYi6aJl7/8j/pcRI1FS8Qc=; b=pWnSqlUl8r67ePGEvS5Ki3JGw8Wq4ReDDQFn4AU5RJmxdaAqvayA6R3QNImyW8Ct5RnAK8 PsyUrv4S7JYkM7Fn8APgRjPkoG+wEFsb1Zek4SLuhFBAsGnwrsOGmdsH5RaHPtEb0aMRKs cXNbbo+WIpc4trbpNDJi2hOQ5CcyfXtN5iWHoWq07YdEu7hzRZ8w97teGBxdPMtYzwraNU 2Vg8Ow3pyjmW/LgfbNq7jWuAK5DqmJh6zK2pOUiU+baF63EqlwB9SsrjFkHbWyaKoRFVfp HZKHRYn+6bTXpVuGuutqWu6y5nrxLcGDV0zacRrCoCVbkLTdZLhv5y6Cl9+4Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010688; 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; bh=SuF5cgTMnPjo0QPl/jEw0fYi6aJl7/8j/pcRI1FS8Qc=; b=cQB53e9Wq8jCAIghTdmsdOAmDwgejtApOzy/zD9uEm3IV7unUpmZf5Ui5mpsFkjYr7AbXn sc5y9KAvB/xxLyvzKXlBdtL7nDz8SYIt5AQvklMSQ+JKvXvZLBJ57crH0NtUceWOhP0Xtf U9qTrcg8f2JhZ/aczH5GLauxkDsFn5mEGtfPPb2L3LgsC4X4g5KGGIwlh3CI6SbPZsJSSj BW8egyMzBO5YK+md0fu8Xm6RnFhuOd5P6hQ6MjExpiItwIVPD1P+qIkVqIWpMAtyt8nEil 4WNia9Mpx1O5UMTy8JVFPPlqJsjOjKAvip1m2O9bPPPYvXASHRXsYNatLLTEhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010688; a=rsa-sha256; cv=none; b=I0TGJwVDSPHGpx0E5rL5BqsBUv6fqI5vF1gjM3PY6wZoxNYdvfViXkrM05G/Po7C5ugIkn xUF3rOdgt6JXRSfEOWcJpPn0Dwi3kirSpPJSjuD8Z/na7ENiKRgDhozt05BXFTkL67Nd7Q XjNAAPkquaFyat/CqMjCcc4hdje8wlqZguZ3HuF6JNJvlLHIp9ZDC2mKP00O0uhhBJAUqZ fTBU3pEmpeqTi0hDIwIFsQshz2kmK9EoIExbTYl6rPfw0ui5K0dXaYpP3j5nKBSK4T70jM o4s/aiaND4JyeXqeVK2gd42WhdNT0Ud0apbHfEeBq18q9/iImXnR/5xBw6Vt7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfwGm5PH1zDP for ; Mon, 29 Dec 2025 12:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 320d4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:18:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ayrton Munoz From: Dimitry Andric Subject: git: b354a138c0cb - stable/13 - cross-build: Avoid adding to SYSINCS 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b354a138c0cb672dc6540917f3fdada49bac4b2c Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:18:08 +0000 Message-Id: <69527180.320d4.3c0658e2@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b354a138c0cb672dc6540917f3fdada49bac4b2c commit b354a138c0cb672dc6540917f3fdada49bac4b2c Author: Ayrton Munoz AuthorDate: 2025-12-29 02:02:28 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:16:55 +0000 cross-build: Avoid adding to SYSINCS Summary: The sys/cdefs.h in src is incompatible with glibc's sys/cdefs.h so cross-building broke when the former was added to SYSINCS in 1c9ff80f06. This commit adds a guard around that to only do that when building on FreeBSD. This should fix github CI. Test Plan: Ran buildkernel using tools/build/make.py on linux in github CI and locally on FreeBSD to double check nothing broke. Reviewed by: dim MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54385 (cherry picked from commit b6672803a1cf10dd1c912fe6571a8d426b8868bd) --- tools/build/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index d08406516362..b6925688896d 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -231,9 +231,11 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h +.if ${.MAKE.OS} == "FreeBSD" # Needed to build most of the things below, which include sys/cdefs.h either # directly or transitively SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h +.endif # Needed to build config (since it uses libnv) SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \