Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1611056538163780"
MIME-Version: 1.0
Date: Tue, 19 Jan 2021 11:42:18 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/mk/tools
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20210119114218.35384FA9D@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Tue Jan 19 11:42:18 UTC 2021

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 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.


--_----------=_1611056538163780
Content-Disposition: inline
Content-Length: 1546
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.60 pkgsrc/mk/tools/tools.Darwin.mk:1.61
--- pkgsrc/mk/tools/tools.Darwin.mk:1.60	Sat Oct 10 09:31:50 2020
+++ pkgsrc/mk/tools/tools.Darwin.mk	Tue Jan 19 11:42:18 2021
@@ -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.gerep?=		/usr/bin/egrep
 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.
+#
+# 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
 #
-.if ${OS_VERSION:R} > 9 && ${OS_VERSION:R} < 20
-TOOLS_PLATFORM.gmake?=		/usr/bin/gnumake
-TOOLS_PLATFORM.gm4?=		/usr/bin/gm4
-.endif
 TOOLS_PLATFORM.grep?=		/usr/bin/grep
 .if exists(/usr/bin/groff)
 TOOLS_PLATFORM.groff?=/usr/bin/groff


--_----------=_1611056538163780--