[pkgsrc/trunk]: pkgsrc/mk/tools mk/tools: Avoid native GNU make/m4 on all Dar...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/97b3c0e389be
branches:  trunk
changeset: 445296:97b3c0e389be
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jan 19 11:42:18 2021 +0000

description:
mk/tools: Avoid native GNU make/m4 on all Darwin systems.

Previously this was only done on Big Sur to work around the issue where XCode
does not support running these programs via a symlink, breaking .tools/bin.

However, with the update to autoconf 2.70, the native GNU m4 from 2006 on all
Darwin systems is too old and breaks the build on Catalina and older, causing
massive dependency failures.

Avoiding them both completely at this time is the simplest way forward.

diffstat:

 mk/tools/tools.Darwin.mk |  20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diffs (35 lines):

diff -r a95c1a97991c -r 97b3c0e389be mk/tools/tools.Darwin.mk
--- a/mk/tools/tools.Darwin.mk  Tue Jan 19 10:34:13 2021 +0000
+++ b/mk/tools/tools.Darwin.mk  Tue Jan 19 11:42:18 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.60 2020/10/10 09:31:50 jperkin Exp $
+# $NetBSD: tools.Darwin.mk,v 1.61 2021/01/19 11:42:18 jperkin Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -49,13 +49,19 @@
 TOOLS_PLATFORM.gfrep?=         /usr/bin/fgrep
 TOOLS_PLATFORM.ggrep?=         /usr/bin/grep
 #
-# Big Sur does not support running XCode programs through a symlink, which
-# breaks the .tools/bin directory.
+# Avoid using the native gnumake and gm4.  On systems up to and including Big
+# Sur, the version of GNU m4 is from 2006 and unable to build autoconf 2.70.
 #
-.if ${OS_VERSION:R} > 9 && ${OS_VERSION:R} < 20
-TOOLS_PLATFORM.gmake?=         /usr/bin/gnumake
-TOOLS_PLATFORM.gm4?=           /usr/bin/gm4
-.endif
+# While this could be more cleanly handled with a GM4_REQD set to a recent
+# version, there is a larger problem that Big Sur does not support running
+# these XCode programs through a symlink, causing the links in the .tools/bin
+# directory to fail.
+#
+# Avoiding them completely at this time is much simpler.
+#
+#TOOLS_PLATFORM.gmake?=                /usr/bin/gnumake
+#TOOLS_PLATFORM.gm4?=          /usr/bin/gm4
+#
 TOOLS_PLATFORM.grep?=          /usr/bin/grep
 .if exists(/usr/bin/groff)
 TOOLS_PLATFORM.groff?=/usr/bin/groff