From nobody Sun Feb 9 00:31:10 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 4Yr7t66Q6Cz5nSBf; Sun, 09 Feb 2025 00:31:10 +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 4Yr7t65qxlz3T5H; Sun, 09 Feb 2025 00:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739061070; 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=hbNApKMAGCo4UNiXCJFipWxjoCVLVNAxl3PxiZsZwDw=; b=fUlrwbncaz9TbXg464xOroHUGVlBQ8AZXlOsaFpRLqFUu0oCvuWc85TL2HkYP+N1GFmEdf Ue/nkwFG7vG2yRq0ZIXHb0Mf7aQ8puXcxpJKa8Pu8WVkaT0kUsyydxBpWmU54zt6OfFB3n /JD+lb5eHQTAkEejn5e+abvDrwwk2NqUzXe5SF3f9+/YidACU5WTubXKGJSVeVgeYMfOF6 k6/R+D9eTkvO2/5QoNRvSuW3KKKpNw/N/YWsfpE6LIQcnnJD3R5zEwe1e3WxjNgfWHH4V8 F5RhWYlb8mCT3AZPj4msQRgQJr/qW5FCqahUMJXJ6n/mI6utqGV4ICY4YLD2sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739061070; 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=hbNApKMAGCo4UNiXCJFipWxjoCVLVNAxl3PxiZsZwDw=; b=M0aYXb20po7KhyDswLGXvberwYpZ6yqCoDW2bYbIbaMsTQiQgzFDLBUW1tlaGDnO7SIm2R 8IXg4EpYqJwBTYxxiGvjcy/NFFDwLHlnhUrTYbTUhw/LXCmzLRFf26zhx1ufZ4scI8i5s5 YV1AfJ5oPHdlmAMEgl02DMBZgwR8nMNjcVIcU11efU1zZ/IdS8L9xsvhp87pcqmM4QnHxN jXP9G0qNhTp3cs29oZPSMpw1jbG7h8LNWf0pDbTjOUfiLGCG4jJrvEN01ZLDclpRCDjcrA 4zEfKdBRaaM9lDCRv5v/y05r6U0FhLxR3qouUd3vPK0TWE6Eg0V2cg0SbVLtAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739061070; a=rsa-sha256; cv=none; b=YZIIum8ReJe9RtBV4cAG5+Z4L3ctVTtHN4B19b1K+OjFw4EB9AJZHfS3FYMUVialTDwvlB r+t7yPe0j4KoLr2G5MxvgX9wb6bYicfH23tiQ6bge+HfSN7ft9mkBlR7NH8/zvAZ/Q9mPI BkG4Y6eim4WS7CD13Cc8UU8TQcBo2CwTrTFS9Bhmzmi5aU+PocPOlY9f5avCgfRcUqMxNW R+PLKELSfTgdmdHgFs81tl3b9+CZHuhCZifIu+2EDvOt3pb810SDXTWQ3e6ia9LO2XYSOm agmHoNCm+8cewBAiiG0d5H1dr+V6kqHVvgb/9EiUtx/H+AVZRJIp5IaJFxWabQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yr7t657N6zZcm; Sun, 09 Feb 2025 00:31:10 +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 5190VAVf012257; Sun, 9 Feb 2025 00:31:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5190VAGG012254; Sun, 9 Feb 2025 00:31:10 GMT (envelope-from git) Date: Sun, 9 Feb 2025 00:31:10 GMT Message-Id: <202502090031.5190VAGG012254@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ed8b456f82ed - main - csh: Remove gethost dependency on tc.const.h 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed8b456f82ed822652f2abb24d65ab73ac3dbb0a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ed8b456f82ed822652f2abb24d65ab73ac3dbb0a commit ed8b456f82ed822652f2abb24d65ab73ac3dbb0a Author: Ed Maste AuthorDate: 2025-02-07 01:23:47 +0000 Commit: Ed Maste CommitDate: 2025-02-09 00:30:55 +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 --- bin/csh/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/csh/Makefile b/bin/csh/Makefile index 6b05c01e0a61..5cbb58bd0ead 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -121,9 +121,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. ${HOST_CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \ + -D_h_tc_const \ ${TCSHDIR}/gethost.c .endif