[pkgsrc/trunk]: pkgsrc/mk/platform mk/platform: Support known macOS SDK skew ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1178e139e78f
branches:  trunk
changeset: 445978:1178e139e78f
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Feb 02 15:47:54 2021 +0000

description:
mk/platform: Support known macOS SDK skew mapping.

For example, the recently release macOS 11.2 does not ship a 11.2 SDK, but
continues to use the compatible 11.1 SDK.  This now works correctly without
having to enable OSX_TOLERATE_SDK_SKEW.

These should only be added for releases within the same major version where we
can guarantee compatibility.

diffstat:

 mk/platform/Darwin.mk |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 0eef2827e3e1 -r 1178e139e78f mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Tue Feb 02 15:36:46 2021 +0000
+++ b/mk/platform/Darwin.mk     Tue Feb 02 15:47:54 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.101 2020/10/30 17:28:25 jperkin Exp $
+# $NetBSD: Darwin.mk,v 1.102 2021/02/02 15:47:54 jperkin Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -105,7 +105,15 @@
 _OPSYS_INCLUDE_DIRS?=  /usr/include
 .elif exists(/usr/bin/xcrun)
 .  if !defined(OSX_SDK_PATH)
-OSX_SDK_PATH!= /usr/bin/xcrun --sdk macosx${OSX_VERSION} --show-sdk-path 2>/dev/null || echo /nonexistent
+#
+# Apple do not always keep the SDK version in step with the OS version.  When
+# that happens add a mapping below, but only within the same OS release major.
+#
+OSX_SDK_MAP.11.2=      11.1
+#
+OSX_SDK_PATH!= /usr/bin/xcrun \
+                   --sdk macosx${OSX_SDK_MAP.${OSX_VERSION}:U${OSX_VERSION}} \
+                   --show-sdk-path 2>/dev/null || echo /nonexistent
 OSX_TOLERATE_SDK_SKEW?=        no
 .    if ${OSX_SDK_PATH} == "/nonexistent" && !empty(OSX_TOLERATE_SDK_SKEW:M[Yy][Ee][Ss])
 OSX_SDK_PATH!= /usr/bin/xcrun --sdk macosx --show-sdk-path 2>/dev/null || echo /nonexistent