From nobody Sun Aug 04 10:23:21 2024 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 4WcFyd5G65z5SYTB; Sun, 04 Aug 2024 10:23:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WcFyd4FvDz4BrB; Sun, 4 Aug 2024 10:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722767001; 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=jGQ1IGcFQyeg4vxc5SVTPgK2u/5ZJvT2DQEBWUXEZdU=; b=Yh7CzeSFBWieb+fWQEs01aycqSYvL04XXIyyWIaccV9t+6eQi3J+ufaVkYSRy/6QfpCy85 JfjqO3VGRxnsGABP0wyiVn2VfiXz1TuJrZrSZQxxzIDoZTu0TIPEk4ofLjFqQQjixTTmb+ 4fYOywobUQgo7gRrtC6kBPNBEDRsYj4KS6sbwVkCYEL2hsPwC006jq0/5Lt9GDyzV4R0ON xZc0woYBAb8it6ZoW5mp0bb7uOfcnnsz2T7nK1p/3pasLS4pMtmkJe9hrJknjnjq+eKKE2 NNVkRd3T8RAl8uFOd8IMvu2Cl3BDDrytInA9Ouhwvey+s6MX58qG56VLkmTCSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722767001; a=rsa-sha256; cv=none; b=BQrAE+Dr3UOaJ0FmQ+VcfiPrJE9LjudgNWfYs1qnW7e0LSBZzottfd8H6B1P5CBXzNVtjy rPlADOi3cvXLpZIVn/hfAZEpPxqP+swocARDurPCNXWMGFuQrMNpXXB2I/XJaGgAQf0Fv1 eTr/qaKEPsCa74FUV6F7sU9RuwzWl+9Qjjy1j9vJYEz/VY1VNr6hfitBGB1ZZLUYVwdnsq 5ytVgD1g5+B/h5LkkAm/Q2ut3wt+k80VeP07Zh+8lSWq6WkhxBj4MFvMRO42ziN7gEL0D1 HBmTyyiDcCH7mGtNaTVBWsdShOcXK0+f+0tydvmS+MumwMI/iCEUWI6CsgI0rA== 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=1722767001; 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=jGQ1IGcFQyeg4vxc5SVTPgK2u/5ZJvT2DQEBWUXEZdU=; b=lWIlcNbhu28CG6zIfkNO8kyV2ABZZbQEf8G7ulpLMjShZZ+0T4MkxHyoFRUxCXUHe20rkd JgEkUI9Bq9C026yHg44K5HyURPwa/qBgKqImg5G1mnTgtEjVUkaSjeipx3ipGo4T9TIGrB mPNoKEu/9OKUIM3F63xxfx/3eXk1sr2UEbgEOdrKk+rJQM/AH+1q9fgwH69an5cC/bE5zA FmyoJJ7ttAwi2jUN1d1eg8YEkXwQT0UvTEXao0pObZrGnTunHAk4kYkWratNBB18uL6PcZ LDU87U1PAGluSNn6lBiHcy4oeMIcPLGwP05Y6Hwv0M0wkqr/+MJSTHzV1xalBw== 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 4WcFyd3sN1zs9J; Sun, 4 Aug 2024 10:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 474ANLlJ045652; Sun, 4 Aug 2024 10:23:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 474ANLeU045649; Sun, 4 Aug 2024 10:23:21 GMT (envelope-from git) Date: Sun, 4 Aug 2024 10:23:21 GMT Message-Id: <202408041023.474ANLeU045649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 2b05d46dc32f - stable/14 - Fix incorrect -I option in sys/conf/Makefile.arm 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/14 X-Git-Reftype: branch X-Git-Commit: 2b05d46dc32f89f915ed3f75b988925b43ebcd7a Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2b05d46dc32f89f915ed3f75b988925b43ebcd7a commit 2b05d46dc32f89f915ed3f75b988925b43ebcd7a Author: Dimitry Andric AuthorDate: 2024-07-31 19:23:41 +0000 Commit: Dimitry Andric CommitDate: 2024-08-04 10:21:10 +0000 Fix incorrect -I option in sys/conf/Makefile.arm In commit 8e53cd7099436 the intent was to add sys/dts/include to the compiler include path, but this was spelled incorrectly, leading to an error with clang 19: cc: error: no such include directory: '$/dts/include' [-Werror,-Wmissing-include-dirs] Use the spelling -I$S/dts/include instead. MFC after: 3 days (cherry picked from commit 8ce3e489a5eec1b41bc5e08f43c5e95aa8115b93) --- sys/conf/Makefile.arm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index af6ce7136636..5195191e0156 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -29,7 +29,7 @@ S= ../../.. .endif .include "$S/conf/kern.pre.mk" -INCLUDES+= -I$S/contrib/libfdt -I$S/contrib/device-tree/include -I$$/dts/include +INCLUDES+= -I$S/contrib/libfdt -I$S/contrib/device-tree/include -I$S/dts/include LINUX_DTS_VERSION!= awk '/freebsd,dts-version/ { sub(/;$$/,"", $$NF); print $$NF }' $S/dts/freebsd-compatible.dts CFLAGS += -DLINUX_DTS_VERSION=\"${LINUX_DTS_VERSION}\"