CVS commit: pkgsrc/mk/tools

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Mar 22 18:59:04 UTC 2024

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

Log Message:
macOS: avoid install popups for missing m4 or yacc.

NFCI on non-macOS or macOS with working /usr/bin/{m4,yacc}.

FCI on macOS with Command Line Tools 15.3.0.0.1.1708646388: packages
that don't properly declare m4 or yacc in USE_TOOLS will now silently
invoke no-op versions of those tools, rather than popping up the useless
CLT install dialog.

Post-freeze, we can consider switching to TOOLS_FAIL and/or generalizing
an optional mode in which invoking any undeclared tool on any platform
breaks the build.


To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 pkgsrc/mk/tools/replace.mk
cvs rdiff -u -r1.65 -r1.66 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.

Modified files:

Index: pkgsrc/mk/tools/replace.mk
diff -u pkgsrc/mk/tools/replace.mk:1.300 pkgsrc/mk/tools/replace.mk:1.301
--- pkgsrc/mk/tools/replace.mk:1.300    Tue Jul 25 17:21:07 2023
+++ pkgsrc/mk/tools/replace.mk  Fri Mar 22 18:59:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.300 2023/07/25 17:21:07 gdt Exp $
+# $NetBSD: replace.mk,v 1.301 2024/03/22 18:59:04 schmonz Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -430,6 +430,9 @@ TOOLS_CREATE+=                      gm4
 TOOLS_PATH.gm4=                        ${TOOLBASE}/bin/gm4
 .  endif
 TOOLS_ALIASES.gm4=             m4
+.elif !empty(OSX_TOOLS_FORCE_NOOP:Mgm4)
+# After 2024Q1: switch to TOOLS_FAIL and/or generalize to all undeclared tools
+TOOLS_NOOP+=                   gm4
 .endif
 
 .if !defined(TOOLS_IGNORE.gmake) && !empty(_USE_TOOLS:Mgmake)
@@ -583,6 +586,9 @@ TOOLS_DEPENDS.m4?=          m4>=1.4:../../devel/
 TOOLS_CREATE+=                 m4
 TOOLS_PATH.m4=                 ${TOOLBASE}/bin/gm4
 .  endif
+.elif !empty(OSX_TOOLS_FORCE_NOOP:Mm4)
+# After 2024Q1: switch to TOOLS_FAIL and/or generalize to all undeclared tools
+TOOLS_NOOP+=                   m4
 .endif
 
 .if !defined(TOOLS_IGNORE.mail) && !empty(_USE_TOOLS:Mmail)
@@ -868,6 +874,12 @@ TOOLS_ARGS.yacc=           -y
 #
 TOOLS_VALUE_GNU.yacc=          ${TOOLS_CMDLINE.yacc}
 .  endif
+.elif !empty(OSX_TOOLS_FORCE_NOOP:Myacc)
+.  if (defined(TOOLS_IGNORE.bison-yacc) || empty(_USE_TOOLS:Mbison-yacc)) \
+   && (defined(TOOLS_IGNORE.byacc) || empty(_USE_TOOLS:Mbyacc))
+# After 2024Q1: switch to TOOLS_FAIL and/or generalize to all undeclared tools
+TOOLS_NOOP+=                   yacc
+.  endif
 .endif
 
 _TOOLS.zip=    zip zipcloak zipnote zipsplit

Index: pkgsrc/mk/tools/tools.Darwin.mk
diff -u pkgsrc/mk/tools/tools.Darwin.mk:1.65 pkgsrc/mk/tools/tools.Darwin.mk:1.66
--- pkgsrc/mk/tools/tools.Darwin.mk:1.65        Wed Mar 20 15:59:54 2024
+++ pkgsrc/mk/tools/tools.Darwin.mk     Fri Mar 22 18:59:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.65 2024/03/20 15:59:54 schmonz Exp $
+# $NetBSD: tools.Darwin.mk,v 1.66 2024/03/22 18:59:04 schmonz Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -110,6 +110,9 @@ OSX_PATH_TO_M4=                     ${OSX_PATH_TO_M4_cmd:s
 MAKEFLAGS+=                    OSX_PATH_TO_M4=${OSX_PATH_TO_M4:Q}
 .if ${OSX_PATH_TO_M4} != ""
 TOOLS_PLATFORM.m4?=            ${OSX_PATH_TO_M4}
+.else
+OSX_TOOLS_FORCE_NOOP+=         m4
+OSX_TOOLS_FORCE_NOOP+=         gm4
 .endif
 TOOLS_PLATFORM.mail?=          /usr/bin/mail
 .if exists(/usr/bin/makeinfo)
@@ -166,4 +169,6 @@ TOOLS_PLATFORM.wish?=               /usr/bin/wish
 TOOLS_PLATFORM.xargs?=         /usr/bin/xargs
 .if ${OSX_PATH_TO_YACC} != ""
 TOOLS_PLATFORM.yacc?=          ${OSX_PATH_TO_YACC}
+.else
+OSX_TOOLS_FORCE_NOOP+=         yacc
 .endif