Tue Sep 13 05:37:50 2022 UTC ()
mk: OSX_SDK_MAP 12.6 -> 12.3


(tnn)
diff -r1.116 -r1.117 pkgsrc/mk/platform/Darwin.mk
cvs diff -r1.116 -r1.117 pkgsrc/mk/platform/Darwin.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Darwin.mk 2022/09/12 12:32:31 1.116
+++ pkgsrc/mk/platform/Darwin.mk 2022/09/13 05:37:50 1.117
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Darwin.mk,v 1.116 2022/09/12 12:32:31 jperkin Exp $ 1# $NetBSD: Darwin.mk,v 1.117 2022/09/13 05:37:50 tnn Exp $
2# 2#
3# Variable definitions for the Darwin operating system. 3# Variable definitions for the Darwin operating system.
4 4
5# OS, Kernel, Xcode Version 5# OS, Kernel, Xcode Version
6# Note that Xcode gets updates on older systems sometimes. 6# Note that Xcode gets updates on older systems sometimes.
7# pkgsrc generally expects that the most up-to-date xcode available for 7# pkgsrc generally expects that the most up-to-date xcode available for
8# an OS version is installed 8# an OS version is installed
9# 9#
10# Codename OS Kernel Xcode 10# Codename OS Kernel Xcode
11# ------------ ------- ------ --------------------------- 11# ------------ ------- ------ ---------------------------
12# Cheetah 10.0.x 1.3.1 12# Cheetah 10.0.x 1.3.1
13# Puma 10.1.x 5.x.y 13# Puma 10.1.x 5.x.y
14# Jaguar 10.2.x 6.x.y 14# Jaguar 10.2.x 6.x.y
@@ -101,26 +101,27 @@ MAKEFLAGS+= OSX_VERSION=${OSX_VERSION:Q @@ -101,26 +101,27 @@ MAKEFLAGS+= OSX_VERSION=${OSX_VERSION:Q
101# into /usr/include, so we need to query their location if /usr/include is 101# into /usr/include, so we need to query their location if /usr/include is
102# not available. 102# not available.
103# 103#
104# Apple do not always keep the SDK version in step with the OS version. When 104# Apple do not always keep the SDK version in step with the OS version. When
105# that happens add a mapping below, but only within the same OS release major. 105# that happens add a mapping below, but only within the same OS release major.
106# 106#
107OSX_SDK_MAP.11.2= 11.1 107OSX_SDK_MAP.11.2= 11.1
108OSX_SDK_MAP.11.4= 11.3 108OSX_SDK_MAP.11.4= 11.3
109OSX_SDK_MAP.11.5= 11.3 109OSX_SDK_MAP.11.5= 11.3
110OSX_SDK_MAP.11.6= 11.3 110OSX_SDK_MAP.11.6= 11.3
111OSX_SDK_MAP.12.2= 12.1 111OSX_SDK_MAP.12.2= 12.1
112OSX_SDK_MAP.12.4= 12.3 112OSX_SDK_MAP.12.4= 12.3
113OSX_SDK_MAP.12.5= 12.3 113OSX_SDK_MAP.12.5= 12.3
 114OSX_SDK_MAP.12.6= 12.3
114# 115#
115# If the user has set MACOSX_DEPLOYMENT_TARGET (ideally at bootstrap time) to 116# If the user has set MACOSX_DEPLOYMENT_TARGET (ideally at bootstrap time) to
116# select a specific SDK then we prefer that. 117# select a specific SDK then we prefer that.
117# 118#
118.if defined(MACOSX_DEPLOYMENT_TARGET) 119.if defined(MACOSX_DEPLOYMENT_TARGET)
119. if !defined(OSX_SDK_PATH) 120. if !defined(OSX_SDK_PATH)
120OSX_SDK_PATH!= /usr/bin/xcrun --sdk macosx${MACOSX_DEPLOYMENT_TARGET} \ 121OSX_SDK_PATH!= /usr/bin/xcrun --sdk macosx${MACOSX_DEPLOYMENT_TARGET} \
121 --show-sdk-path 2>/dev/null || echo /nonexistent 122 --show-sdk-path 2>/dev/null || echo /nonexistent
122. endif 123. endif
123ALL_ENV+= MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} 124ALL_ENV+= MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}
124MAKEFLAGS+= OSX_SDK_PATH=${OSX_SDK_PATH:Q} 125MAKEFLAGS+= OSX_SDK_PATH=${OSX_SDK_PATH:Q}
125_OPSYS_INCLUDE_DIRS?= ${OSX_SDK_PATH}/usr/include 126_OPSYS_INCLUDE_DIRS?= ${OSX_SDK_PATH}/usr/include
126CWRAPPERS_APPEND.cc+= -isysroot ${OSX_SDK_PATH} 127CWRAPPERS_APPEND.cc+= -isysroot ${OSX_SDK_PATH}