From nobody Thu May 01 20:15:12 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 4ZpQJw3wZjz5vgK8; Thu, 01 May 2025 20:15:12 +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 4ZpQJw2nTCz3YWw; Thu, 01 May 2025 20:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746130512; 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=T8ahzjbbsJgb8KG5hoZiGyB8/eythTveHfKBPf+BRUk=; b=OpMi1OJm6UGGZTjp8V6MAmGkUgzqCGtkekV6x7Xp8HRD0LmqhfAa2fRES9l1H0rajgIc+o D/qp7D6vsJP803Wn9+ZR1lLcGVYFgDikOAiMxT3z56cMEXS2yTd23+fTNx9V19tk+3/kL4 usLU77NLloLF8Uan8VTqG2zaYNJsqrqdBROMVR2w94LqXrG3dno7Q9M+VvUdEJvUXilBhy Z3awros7qfRUzAEtEJZQyIrwX9LWBBnYIJExIpNX/ecO7Ac0FImzcsO5U7DwFMN96chw8Z +Jvoon4z6vipydOJFnsq1jkgOdr2z+ZOOoesG2n+HPL8epAE1GjOfpt364/W0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746130512; 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=T8ahzjbbsJgb8KG5hoZiGyB8/eythTveHfKBPf+BRUk=; b=PWr6J1g7XBkYXjNxidoEta0p4M0yqC7RsNd6IeocUDfEIpZ58ZurV+YR/xplWMDJjQHTz4 7s9ACz+81+1JgrVlZF9YlIAZK2VQDD4atuKIee14DkQUaUCdWgLDjRK9TjOyZ8+Bwftwez nI+ZNe8LBn03lsEM3D5FB/daXH3A14aKa8nVtIXFCBNdDdXQEwiCX+X5jTdXsE5Wky0Og8 ymu8lPq6N4q4ULpkyj1uWnwzaZuysBTUCWhCye/2bUTJczUO6XQWZzl77zEiIIQsHEz5TI Qu+9i5cqaI5IZ2WNt5SGppFNk4sSQI0oogwM2xpoureMi1bLD40qE/PESWQAsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746130512; a=rsa-sha256; cv=none; b=fxjvshkIAMFJbJHpOYor8PXda3Z7q5f85bMV2LlGxc6AopAuCCYjWtGnry/C1JO+E1nz5O uDLbWuVYZNsk/eRw3CKvRrrjsgwPYasCT9ubVquaPOQAm2KQotawiuPMhkqtVAKkswhtD3 owJQLmhuGuzKgSX3gFywoxpNBS6QkBbmM4jjJt5fKS2sTrOxW7Jpk193Q6Y0i6+SR8Rk5a ESBartc4BPlTM662tjgGMmtTbA32g5JxCdsnUSDexzKEwQweyUBen6SmlB9SXGNFPEUIBa bceBY5IINaEXfhjYla+0kECGYO+7yNSTuyglr+KDa21XKwRL5yBbsJjWzf6D0A== 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 4ZpQJw2NxHzjTJ; Thu, 01 May 2025 20:15:12 +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 541KFC2p011810; Thu, 1 May 2025 20:15:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541KFC0P011807; Thu, 1 May 2025 20:15:12 GMT (envelope-from git) Date: Thu, 1 May 2025 20:15:12 GMT Message-Id: <202505012015.541KFC0P011807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: f383cfc03bbf - stable/14 - sys.mk: Improve ports compatibility hack guard 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f383cfc03bbf89516135d67dcd6018a6be1b9533 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=f383cfc03bbf89516135d67dcd6018a6be1b9533 commit f383cfc03bbf89516135d67dcd6018a6be1b9533 Author: Brooks Davis AuthorDate: 2025-03-04 20:50:32 +0000 Commit: Brooks Davis CommitDate: 2025-05-01 20:14:24 +0000 sys.mk: Improve ports compatibility hack guard Back in 9ca543438039 and include of bsd.cpu.mk in sys.mk was added as a hack for ports Makefiles. This works fine in general (for values of fine that include not being able to use MK_ variables in bsd.cpu.mk), but has surprising effects on MacOS with a case insensitive filesystems. There we build things in paths like share/docs/IPv6 where ../../Mk/bsd.port.mk matches share/mk/bsd.port.mk. Fix this issue by checking for ../../Mk/Uses which seems highly unlikely to match something in share/mk. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D49232 (cherry picked from commit e62ff34a6761025203b77ffb241c926ac8d218c8) --- share/mk/sys.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 8cdaae4a3de2..b668e4b3a75e 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -326,7 +326,7 @@ __MAKE_SHELL?=/bin/sh # the ports files are modernized, and a reasonable transition # period has passed, include it while we're in a ports tree here # to preserve historic behavior. -.if exists(${.CURDIR}/../../Mk/bsd.port.mk) +.if exists(${.CURDIR}/../../Mk/Uses) .include .endif