From nobody Tue Mar 04 20:51:38 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 4Z6nsk44r1z5qhBL; Tue, 04 Mar 2025 20:51:38 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z6nsk241cz3cpZ; Tue, 04 Mar 2025 20:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741121498; 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=yL1W5PdkPipn0bwnj/1Weyn7QIi65v1e1iXids91eRQ=; b=bmdSwvdGTYwQZFcSxLH4xVa18z9gzmJtStdbFKlMsp1fAJ2Zn7W9CcfJGTOuIzOmayLJjE ehT+NoUJBQm5DW70jFRyOjte0J5jpGiFojI+C87O1ruOyqTbpNIcndhDs3WgkDLThZlqHz uQrjwwZ4myEauDVCf1VFnM2XLdRnoLDowNRjKXMw9yZ0UWh3yXDRFg6eZhcXfY7nBhp2Cb 4of4a2Kp2hIFAe41mY4TtI3eMKQLFGhFwR4+ht+qkto/5tTCVQ0J2bBrRwkNAp5Y/kxaE2 boZO11SkLQpGiapXcUoCLLiwolx5pJWhHAMWT72zXPagdRslKnznF10IbsAfgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741121498; a=rsa-sha256; cv=none; b=f1BVcwpXTsX45/j161APheN2bXMz8H9R4juc5S8KY+Hbz86zkFMyKVDsLcaoFWfO2f04Eh iWnm6SG3fzKrmCkHHTkls7deAAQykYbJDG35G/9b3Gcbcgc/s98pjn+hQ+AOvx0ek0k75o Kesc6vdLvA8gukOSd14RyD2/sGMuuQS57fJZT5J4QfkByuQwTblJxVGOLZW4wOOE/WR4z8 T0cq2sb2LIo4ytoqW5V1JpwYKhl3LgkrqLFO9auxpHnbNw2NuMhUNBfZ03h0GuMnsxnwA/ KARLqCJ8+iYbCZSIgjYh5pkqGtKTEFicJNhvxbu99/Nvvd8DfENFdynndu9hkQ== 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=1741121498; 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=yL1W5PdkPipn0bwnj/1Weyn7QIi65v1e1iXids91eRQ=; b=INCH+egj76DCL+MleBmzwk4OxgEWeW4kcCyBl/+pELRkcPOh2bboQkwyB8mAnJA4lB4cAT 2BpOHebEfZs0NJo2UQpv0DJW4lAQzu8eqIpIgBw/EUqhcu/soo6NxaPEctzMHfkMpiwwWb l5mwc4tYAIGNFTcWio+e30nl6h8BuqQGS7XlI83NA2aaiv1x2c9q+zVz1IZ5Eo67fyfPju QrTq4MNJTjZQm3UZe8iTNnx5E8p05nFqnfofoYjy3hKRDq8eZG5S0KEmUD4I/4+aBMLpI4 XRnNQa9j61ykfhXVC4co+RDdHeiwU+2YUShOBJYfT/g2KZlgHzGn6C7lz6I+0w== 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 4Z6nsk1dvWzZqZ; Tue, 04 Mar 2025 20:51:38 +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 524Kpcoe025683; Tue, 4 Mar 2025 20:51:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 524KpcoG025676; Tue, 4 Mar 2025 20:51:38 GMT (envelope-from git) Date: Tue, 4 Mar 2025 20:51:38 GMT Message-Id: <202503042051.524KpcoG025676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: e62ff34a6761 - main - sys.mk: Improve ports compatibility hack guard 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e62ff34a6761025203b77ffb241c926ac8d218c8 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e62ff34a6761025203b77ffb241c926ac8d218c8 commit e62ff34a6761025203b77ffb241c926ac8d218c8 Author: Brooks Davis AuthorDate: 2025-03-04 20:50:32 +0000 Commit: Brooks Davis CommitDate: 2025-03-04 20:51:10 +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 --- 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 44db9266784f..26f31c104088 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -321,7 +321,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