Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1710166284214490"
MIME-Version: 1.0
Date: Mon, 11 Mar 2024 14:11:24 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/mk/tools
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20240311141124.91F6BFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1710166284214490
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Mon Mar 11 14:11:24 UTC 2024

Modified Files:
	pkgsrc/mk/tools: tools.Darwin.mk

Log Message:
macOS: detect missing m4/yacc Command Line Tools.

CLT 15.3.0.0.1.1708646388 does not provide m4 or yacc. For these two
tools, don't default TOOLS_PLATFORM.foo to "/usr/bin/foo" unless the
backing CLT-provided foo binary is found. This lets the tools framework
fall back to something else, as intended.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/mk/tools/tools.Darwin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1710166284214490
Content-Disposition: inline
Content-Length: 2252
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/tools/tools.Darwin.mk
diff -u pkgsrc/mk/tools/tools.Darwin.mk:1.63 pkgsrc/mk/tools/tools.Darwin.mk:1.64
--- pkgsrc/mk/tools/tools.Darwin.mk:1.63	Wed May 17 19:32:57 2023
+++ pkgsrc/mk/tools/tools.Darwin.mk	Mon Mar 11 14:11:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.63 2023/05/17 19:32:57 wiz Exp $
+# $NetBSD: tools.Darwin.mk,v 1.64 2024/03/11 14:11:24 schmonz Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -14,7 +14,17 @@ TOOLS_PLATFORM.bash?=		/bin/bash
 .if exists(/usr/bin/bsdtar)
 TOOLS_PLATFORM.bsdtar?=		/usr/bin/bsdtar
 .endif
-TOOLS_PLATFORM.byacc?=		/usr/bin/yacc
+# CLT 15.3.0.0.1.1708646388 does not provide yacc. Check whether the
+# /usr/bin/yacc xcode-select stub's target exists before defaulting to it.
+.if !defined(OSX_PATH_TO_YACC)
+OSX_PATH_TO_YACC_cmd=		/usr/bin/xcrun --find yacc 2>/dev/null | \
+				sed -e 's|^/Library/Developer/CommandLineTools||'
+OSX_PATH_TO_YACC=		${OSX_PATH_TO_YACC_cmd:sh}
+.endif
+MAKEFLAGS+=			OSX_PATH_TO_YACC=${OSX_PATH_TO_YACC:Q}
+.if ${OSX_PATH_TO_YACC} != ""
+TOOLS_PLATFORM.byacc?=		${OSX_PATH_TO_YACC}
+.endif
 .if exists(/usr/bin/bzcat)
 TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
 .endif
@@ -88,7 +98,17 @@ TOOLS_PLATFORM.ksh?=		/bin/ksh
 TOOLS_PLATFORM.lex?=		/usr/bin/lex
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
-TOOLS_PLATFORM.m4?=		/usr/bin/m4
+# CLT 15.3.0.0.1.1708646388 does not provide m4. Check whether the
+# /usr/bin/m4 xcode-select stub's target exists before defaulting to it.
+.if !defined(OSX_PATH_TO_M4)
+OSX_PATH_TO_M4_cmd=		/usr/bin/xcrun --find m4 2>/dev/null | \
+				sed -e 's|^/Library/Developer/CommandLineTools||'
+OSX_PATH_TO_M4=			${OSX_PATH_TO_M4_cmd:sh}
+.endif
+MAKEFLAGS+=			OSX_PATH_TO_M4=${OSX_PATH_TO_M4:Q}
+.if ${OSX_PATH_TO_M4} != ""
+TOOLS_PLATFORM.m4?=		${OSX_PATH_TO_M4}
+.endif
 TOOLS_PLATFORM.mail?=		/usr/bin/mail
 .if exists(/usr/bin/makeinfo)
 TOOLS_PLATFORM.makeinfo?=	/usr/bin/makeinfo
@@ -142,4 +162,6 @@ TOOLS_PLATFORM.wc?=		/usr/bin/wc
 TOOLS_PLATFORM.wish?=		/usr/bin/wish
 .endif
 TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
-TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
+.if ${OSX_PATH_TO_YACC} != ""
+TOOLS_PLATFORM.yacc?=		${OSX_PATH_TO_YACC}
+.endif


--_----------=_1710166284214490--