Mon Dec 14 14:14:33 2015 UTC ()
Extend the El Capitan HFS+ bug workaround to 15.1.0 but no further, I can
confirm that Apple fixed the bug in the recent 15.2.0 (10.11.2) update.


(jperkin)
diff -r1.75 -r1.76 pkgsrc/mk/platform/Darwin.mk
cvs diff -r1.75 -r1.76 pkgsrc/mk/platform/Darwin.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Darwin.mk 2015/12/13 22:38:00 1.75
+++ pkgsrc/mk/platform/Darwin.mk 2015/12/14 14:14:33 1.76
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Darwin.mk,v 1.75 2015/12/13 22:38:00 sevan Exp $ 1# $NetBSD: Darwin.mk,v 1.76 2015/12/14 14:14:33 jperkin 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# Cheetah 10.0.x 1.3.1 11# Cheetah 10.0.x 1.3.1
12# Puma 10.1 1.4.1 12# Puma 10.1 1.4.1
13# 10.1.x 5.x.y 13# 10.1.x 5.x.y
14# Jaguar 10.2.x 6.x.y 14# Jaguar 10.2.x 6.x.y
@@ -170,23 +170,23 @@ CONFIGURE_ENV+= ac_cv_func_poll=no @@ -170,23 +170,23 @@ CONFIGURE_ENV+= ac_cv_func_poll=no
170. endif 170. endif
171.endif 171.endif
172 172
173# If the deployment target is not set explicitly, the linker in Tiger and prior 173# If the deployment target is not set explicitly, the linker in Tiger and prior
174# versions running on PowerPC hosts defaults to a target of 10.1. 174# versions running on PowerPC hosts defaults to a target of 10.1.
175# Set the target for Tiger systems to be 10.4. 175# Set the target for Tiger systems to be 10.4.
176.if !empty(MACHINE_PLATFORM:MDarwin-8.*-powerpc) 176.if !empty(MACHINE_PLATFORM:MDarwin-8.*-powerpc)
177MAKE_ENV+= MACOSX_DEPLOYMENT_TARGET="10.4" 177MAKE_ENV+= MACOSX_DEPLOYMENT_TARGET="10.4"
178.endif 178.endif
179 179
180# El Capitan GM has a file system bug where a deep directory hierarchy can be 180# El Capitan GM has a file system bug where a deep directory hierarchy can be
181# created but not removed. Avoid running a test which does exactly this. 181# created but not removed. Avoid running a test which does exactly this.
182# See https://openradar.appspot.com/radar?id=6160634819379200 182# See https://openradar.appspot.com/radar?id=6160634819379200
183.if defined(GNU_CONFIGURE) && !empty(OS_VERSION:M15.0.0) 183.if defined(GNU_CONFIGURE) && !empty(OS_VERSION:M15.[01].0)
184CONFIGURE_ENV+= gl_cv_func_getcwd_abort_bug=no 184CONFIGURE_ENV+= gl_cv_func_getcwd_abort_bug=no
185.endif 185.endif
186 186
187# Use "/bin/ksh" for buildlink3 wrapper script to improve build performance. 187# Use "/bin/ksh" for buildlink3 wrapper script to improve build performance.
188.if (!empty(OS_VERSION:M9.*) || !empty(OS_VERSION:M1[0-2].*) || \ 188.if (!empty(OS_VERSION:M9.*) || !empty(OS_VERSION:M1[0-2].*) || \
189 !empty(OS_VERSION:M1[4-9].*)) && \ 189 !empty(OS_VERSION:M1[4-9].*)) && \
190 exists(/bin/ksh) 190 exists(/bin/ksh)
191WRAPPER_BIN_SH?= /bin/ksh 191WRAPPER_BIN_SH?= /bin/ksh
192.endif 192.endif