Tue Jan 19 11:42:18 2021 UTC ()
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.


(jperkin)
diff -r1.60 -r1.61 pkgsrc/mk/tools/tools.Darwin.mk
cvs diff -r1.60 -r1.61 pkgsrc/mk/tools/tools.Darwin.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/tools.Darwin.mk 2020/10/10 09:31:50 1.60
+++ pkgsrc/mk/tools/tools.Darwin.mk 2021/01/19 11:42:18 1.61
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: tools.Darwin.mk,v 1.60 2020/10/10 09:31:50 jperkin Exp $ 1# $NetBSD: tools.Darwin.mk,v 1.61 2021/01/19 11:42:18 jperkin Exp $
2# 2#
3# System-supplied tools for the Darwin (Mac OS X) operating system. 3# System-supplied tools for the Darwin (Mac OS X) operating system.
4 4
5TOOLS_PLATFORM.[?= [ # shell builtin 5TOOLS_PLATFORM.[?= [ # shell builtin
6TOOLS_PLATFORM.awk?= /usr/bin/awk 6TOOLS_PLATFORM.awk?= /usr/bin/awk
7TOOLS_PLATFORM.basename?= /usr/bin/basename 7TOOLS_PLATFORM.basename?= /usr/bin/basename
8TOOLS_PLATFORM.bash?= /bin/bash 8TOOLS_PLATFORM.bash?= /bin/bash
9# Native bison (at least up to version 2.3 in OSX Lion) does not work 9# Native bison (at least up to version 2.3 in OSX Lion) does not work
10# well in the tools environment and cannot locate m4sugar.m4 without 10# well in the tools environment and cannot locate m4sugar.m4 without
11# BISON_PKGDATADIR being set. For now just pull in the pkgsrc tool. 11# BISON_PKGDATADIR being set. For now just pull in the pkgsrc tool.
12#TOOLS_PLATFORM.bison?= /usr/bin/bison 12#TOOLS_PLATFORM.bison?= /usr/bin/bison
13#TOOLS_PLATFORM.bison-yacc?= /usr/bin/bison -y 13#TOOLS_PLATFORM.bison-yacc?= /usr/bin/bison -y
14.if exists(/usr/bin/bsdtar) 14.if exists(/usr/bin/bsdtar)
@@ -39,33 +39,39 @@ TOOLS_PLATFORM.echo?= echo # shell bu @@ -39,33 +39,39 @@ TOOLS_PLATFORM.echo?= echo # shell bu
39TOOLS_PLATFORM.egrep?= /usr/bin/egrep 39TOOLS_PLATFORM.egrep?= /usr/bin/egrep
40TOOLS_PLATFORM.env?= /usr/bin/env 40TOOLS_PLATFORM.env?= /usr/bin/env
41TOOLS_PLATFORM.expr?= /bin/expr 41TOOLS_PLATFORM.expr?= /bin/expr
42TOOLS_PLATFORM.false?= false # shell builtin 42TOOLS_PLATFORM.false?= false # shell builtin
43TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep 43TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep
44TOOLS_PLATFORM.file?= /usr/bin/file 44TOOLS_PLATFORM.file?= /usr/bin/file
45TOOLS_PLATFORM.find?= /usr/bin/find 45TOOLS_PLATFORM.find?= /usr/bin/find
46TOOLS_PLATFORM.flex?= /usr/bin/flex 46TOOLS_PLATFORM.flex?= /usr/bin/flex
47TOOLS_PLATFORM.ftp?= /usr/bin/ftp 47TOOLS_PLATFORM.ftp?= /usr/bin/ftp
48TOOLS_PLATFORM.gerep?= /usr/bin/egrep 48TOOLS_PLATFORM.gerep?= /usr/bin/egrep
49TOOLS_PLATFORM.gfrep?= /usr/bin/fgrep 49TOOLS_PLATFORM.gfrep?= /usr/bin/fgrep
50TOOLS_PLATFORM.ggrep?= /usr/bin/grep 50TOOLS_PLATFORM.ggrep?= /usr/bin/grep
51# 51#
52# Big Sur does not support running XCode programs through a symlink, which 52# Avoid using the native gnumake and gm4. On systems up to and including Big
53# breaks the .tools/bin directory. 53# Sur, the version of GNU m4 is from 2006 and unable to build autoconf 2.70.
 54#
 55# While this could be more cleanly handled with a GM4_REQD set to a recent
 56# version, there is a larger problem that Big Sur does not support running
 57# these XCode programs through a symlink, causing the links in the .tools/bin
 58# directory to fail.
 59#
 60# Avoiding them completely at this time is much simpler.
 61#
 62#TOOLS_PLATFORM.gmake?= /usr/bin/gnumake
 63#TOOLS_PLATFORM.gm4?= /usr/bin/gm4
54# 64#
55.if ${OS_VERSION:R} > 9 && ${OS_VERSION:R} < 20 
56TOOLS_PLATFORM.gmake?= /usr/bin/gnumake 
57TOOLS_PLATFORM.gm4?= /usr/bin/gm4 
58.endif 
59TOOLS_PLATFORM.grep?= /usr/bin/grep 65TOOLS_PLATFORM.grep?= /usr/bin/grep
60.if exists(/usr/bin/groff) 66.if exists(/usr/bin/groff)
61TOOLS_PLATFORM.groff?=/usr/bin/groff 67TOOLS_PLATFORM.groff?=/usr/bin/groff
62.endif 68.endif
63.if exists(/usr/bin/gnutar) 69.if exists(/usr/bin/gnutar)
64TOOLS_PLATFORM.gtar?= /usr/bin/gnutar 70TOOLS_PLATFORM.gtar?= /usr/bin/gnutar
65.endif 71.endif
66TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f 72TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
67TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat 73TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat
68TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP} 74TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
69TOOLS_PLATFORM.head?= /usr/bin/head 75TOOLS_PLATFORM.head?= /usr/bin/head
70TOOLS_PLATFORM.hostname?= /bin/hostname 76TOOLS_PLATFORM.hostname?= /bin/hostname
71TOOLS_PLATFORM.id?= /usr/bin/id 77TOOLS_PLATFORM.id?= /usr/bin/id