upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-18 18:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

sys.mk: Improve ports compatibility hack guard

Browse source 
Back in 9ca5434380 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)
This commit is contained in:
Brooks Davis 2025-03-04 20:50:32 +00:00
parent 7655a4141e
commit f383cfc03b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
share/mk/sys.mk
View file

@ -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 <bsd.cpu.mk>
.endif