From nobody Tue Feb 18 17:20:33 2025 X-Original-To: dev-commits-src-branches@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 4Yy5rf5HF4z5nv9g; Tue, 18 Feb 2025 17:20:34 +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 4Yy5rf0JJkz3KxB; Tue, 18 Feb 2025 17:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739899234; 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=5H4UqJWdk/0RhZi4UClXG8SmFSfTI+90QM816l1pvdg=; b=bs6U21KOt7EIohSpGhEZX1OgdKnlsxlSi/IozHMmOxq7gNo1xKW0LxbD59YX0SriG4J1Tn /0eTeJt+YOHC1cvKtwYOzacrJ3xA84EdQoTTnxWpC6ys8mNsI4oYqrSyfz+ToptqgHvy6r 51YfQrYBxr3SgNzdIiSZ7Fh22U3eBFqNCBzNBClPv7O0s3uaCPiFZOqPZQYTUqv9FX1Rgx 66IsYl8ZUzCiTFyFV/l9t7ga1zzGlSPJy8FCZ9NGOIGJgIxd/Ii0o73N6O+AsFzqAayyGF ASVIRJ1eY8xjFvmg5g6twsz4uH1JfPgtmkP2vtL8GsBGx/sfrX0Qp20Vrk5NHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739899234; a=rsa-sha256; cv=none; b=LHwnPNIT55l7w2utrOuPg0L2MGLTE3aFM8tFro2rZN801Nx/2M+DfSxYWsPx1i/DlrSGXB kCwFQCatvvlhCvXg2bdNIT6fOa08yH3OePwj3/5BomEX/2q7g/IZVV+/VlKPD67cZ61Y+Z ppLvhMxR/CwbaKRDht6khZ8RIlaB3vPdw7vx1H1cmQOWUEEGO2KNh3X8b3MN4SU+mS+mCM B2l+a7VkSNl0xdMmg3hHcROBeue24c9u53awZhj8mCG2sHqeDiLqSyHNDb/spDnitsH1nv x6qqQZkDQg09efXOwGHA/MOYrGWhEUoRgLGnEqh6PLlYZSAMvqObEJhArBwfdg== 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=1739899234; 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=5H4UqJWdk/0RhZi4UClXG8SmFSfTI+90QM816l1pvdg=; b=Wy5GoXMMepwV8REO4/2+uuyHy1ER4n2RrugLTFIObJV3s7ZdbiJhLvQGpBKhF44v7ABlPN dAx1q0INgpcQjXAaDmZCIB2sEfiaZGogzgZOSe8RXlzLf0+NgvRrgpZR7jhgmE3na2w+Wu warMC1+OF2qORC0OIqZclqmXRqD7LCpleJFpBeduwl9LcZuAwORfqA2AmSgeetaLt0ztW1 zlCD3gomMtp1uP/xn4ADn1F25GncL6KLGl2N6aeIFeem/EJp37FgrEVgKNIkRV7zzawMHF X6Cq+MhYeqBRuEKS2adeIrdOJYQ6z8aa2mrCNNLSK2PHxvXNBcSBKWvOHCErJg== 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 4Yy5rd6w5wzCd4; Tue, 18 Feb 2025 17:20:33 +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 51IHKXAs076026; Tue, 18 Feb 2025 17:20:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51IHKXiS076023; Tue, 18 Feb 2025 17:20:33 GMT (envelope-from git) Date: Tue, 18 Feb 2025 17:20:33 GMT Message-Id: <202502181720.51IHKXiS076023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 65835073dc3d - stable/14 - csh: Remove gethost dependency on tc.const.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 65835073dc3d126fe446d732cd3ce0d93509c92c Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=65835073dc3d126fe446d732cd3ce0d93509c92c commit 65835073dc3d126fe446d732cd3ce0d93509c92c Author: Ed Maste AuthorDate: 2025-02-18 17:19:16 +0000 Commit: Ed Maste CommitDate: 2025-02-18 17:19:16 +0000 csh: Remove gethost dependency on tc.const.h gethost is a build tool built in stage 2.3, but it had a dependency on tc.const.h, which requires target headers (that are not installed until stage 4.1). The build falls back to the host's headers if the target headers don't yet exist, which may result in a build failure if the host's headers don't match the target. As gethost.c doesn't actually require the definitions in tc.const.h, add a hack to skip the include of tc.const.h and remove the dependency. PR: 283273 Reviewed by: imp Sponsored by: The FreeBSD Foundation Fixes: e754e5f36195 ("Upgrade to 6.10") Differential Revision: https://reviews.freebsd.org/D48880 (cherry picked from commit ed8b456f82ed822652f2abb24d65ab73ac3dbb0a) --- bin/csh/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/csh/Makefile b/bin/csh/Makefile index 94e1ba763d6e..7e20c187dee2 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -123,9 +123,14 @@ build-tools: gethost tc.defs.c: gethost DEPENDOBJS+= gethost -gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META} +gethost: gethost.c sh.err.h sh.h ${BUILD_TOOLS_META} @rm -f ${.TARGET} + # Define _h_tc_const so that tc.h will skip including tc.const.h. + # gethost.c does not actually require any of the definitions in there, + # and building tc.const.h requires target headers which are not + # available when we need to build gethost. ${CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \ + -D_h_tc_const \ ${TCSHDIR}/gethost.c .endif