pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/tools mk: Stop using XCode binaries on Big Sur.
details: https://anonhg.NetBSD.org/pkgsrc/rev/2780369c6cfd
branches: trunk
changeset: 440513:2780369c6cfd
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Sat Oct 10 09:31:50 2020 +0000
description:
mk: Stop using XCode binaries on Big Sur.
These no longer support being executed via a symlink, failing with errors
such as:
xcode-select: Failed to locate 'gmake', and no install could be requested
This breaks the entire .tools/bin directory, so we just have to avoid them
and use tools from pkgsrc instead.
It's likely a lot more will need to be added to this list, but this is
enough to get devel/cmake building at least.
diffstat:
mk/tools/tools.Darwin.mk | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (22 lines):
diff -r 17dd32995a76 -r 2780369c6cfd mk/tools/tools.Darwin.mk
--- a/mk/tools/tools.Darwin.mk Sat Oct 10 08:26:56 2020 +0000
+++ b/mk/tools/tools.Darwin.mk Sat Oct 10 09:31:50 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.59 2018/10/17 08:30:43 jperkin Exp $
+# $NetBSD: tools.Darwin.mk,v 1.60 2020/10/10 09:31:50 jperkin Exp $
#
# System-supplied tools for the Darwin (Mac OS X) operating system.
@@ -48,7 +48,11 @@
TOOLS_PLATFORM.gerep?= /usr/bin/egrep
TOOLS_PLATFORM.gfrep?= /usr/bin/fgrep
TOOLS_PLATFORM.ggrep?= /usr/bin/grep
-.if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
+#
+# Big Sur does not support running XCode programs through a symlink, which
+# breaks the .tools/bin directory.
+#
+.if ${OS_VERSION:R} > 9 && ${OS_VERSION:R} < 20
TOOLS_PLATFORM.gmake?= /usr/bin/gnumake
TOOLS_PLATFORM.gm4?= /usr/bin/gm4
.endif
Home |
Main Index |
Thread Index |
Old Index