Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1688672137262350"
MIME-Version: 1.0
Date: Thu, 6 Jul 2023 19:35:37 +0000
From: "Jason Bacon" <bacon@netbsd.org>
Subject: CVS commit: pkgsrc/mk/platform
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: bacon@netbsd.org
Message-Id: <20230706193537.65823FBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	bacon
Date:		Thu Jul  6 19:35:37 UTC 2023

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

Log Message:
mk/platform/Darwin.mk: Remove hard-coded SDK versions

These mappings were not really achieving anything and caused
breakage every time a new SDK was released.
Without them, pkgsrc uses the symlink to the latest SDK,
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk.
See pkgsrc-users discussion 2023-05-26 through 2023-06-09
entitled "Darwin bootstrap failure".


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 pkgsrc/mk/platform/Darwin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1688672137262350
Content-Disposition: inline
Content-Length: 1974
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/platform/Darwin.mk
diff -u pkgsrc/mk/platform/Darwin.mk:1.128 pkgsrc/mk/platform/Darwin.mk:1.129
--- pkgsrc/mk/platform/Darwin.mk:1.128	Sun May 28 09:38:37 2023
+++ pkgsrc/mk/platform/Darwin.mk	Thu Jul  6 19:35:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.128 2023/05/28 09:38:37 bsiegert Exp $
+# $NetBSD: Darwin.mk,v 1.129 2023/07/06 19:35:37 bacon Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -99,28 +99,6 @@ MAKEFLAGS+=		OSX_VERSION=${OSX_VERSION:Q
 .endif
 
 #
-# From Xcode 5 onwards system headers are no longer installed by default
-# into /usr/include, so we need to query their location if /usr/include is
-# not available.
-#
-# 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_MAP.11.4=	11.3
-OSX_SDK_MAP.11.5=	11.3
-OSX_SDK_MAP.11.6=	11.3
-OSX_SDK_MAP.11.7=	12.1
-OSX_SDK_MAP.12.2=	12.1
-OSX_SDK_MAP.12.4=	12.3
-OSX_SDK_MAP.12.5=	12.3
-OSX_SDK_MAP.12.6=	12.3
-OSX_SDK_MAP.13.0=	13.0
-OSX_SDK_MAP.13.1=	13.1
-OSX_SDK_MAP.13.2=	13.1
-OSX_SDK_MAP.13.3=	13.3
-OSX_SDK_MAP.13.4=	13.3
-#
 # If the user has set MACOSX_DEPLOYMENT_TARGET (ideally at bootstrap time) to
 # select a specific SDK then we prefer that.
 #
@@ -140,13 +118,7 @@ _WRAP_EXTRA_ARGS.CXX+=	-isysroot ${OSX_S
 _OPSYS_INCLUDE_DIRS?=	/usr/include
 .elif exists(/usr/bin/xcrun)
 .  if !defined(OSX_SDK_PATH)
-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
-.    endif
 MAKEFLAGS+=	OSX_SDK_PATH=${OSX_SDK_PATH:Q}
 .  endif
 .  if exists(${OSX_SDK_PATH}/usr/include/stdio.h)


--_----------=_1688672137262350--