Sun Nov 13 11:06:40 2016 UTC ()
fix the test for <poll.h>/<sys/poll.h> - use _OPSYS_INCLUDE_DIRS instead
of assuming /usr/include; this fixes compilation of net/socat,
which has broken !HAVE_POLL code


(jdolecek)
diff -r1.84 -r1.85 pkgsrc/mk/platform/Darwin.mk
cvs diff -r1.84 -r1.85 pkgsrc/mk/platform/Darwin.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Darwin.mk 2016/10/27 10:31:06 1.84
+++ pkgsrc/mk/platform/Darwin.mk 2016/11/13 11:06:40 1.85
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Darwin.mk,v 1.84 2016/10/27 10:31:06 jperkin Exp $ 1# $NetBSD: Darwin.mk,v 1.85 2016/11/13 11:06:40 jdolecek 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
@@ -162,27 +162,27 @@ _OPSYS_CAN_CHECK_SHLIBS= yes # check sha @@ -162,27 +162,27 @@ _OPSYS_CAN_CHECK_SHLIBS= yes # check sha
162# (e.g. adding "-u -r" which would fix the issue) when using install -s so for 162# (e.g. adding "-u -r" which would fix the issue) when using install -s so for
163# now stripping is disabled in that mode. 163# now stripping is disabled in that mode.
164_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-Wl,-x} # cc(1) option to strip 164_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-Wl,-x} # cc(1) option to strip
165_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U} # install(1) option to strip 165_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U} # install(1) option to strip
166 166
167# check for maximum command line length and set it in configure's environment, 167# check for maximum command line length and set it in configure's environment,
168# to avoid a test required by the libtool script that takes forever. 168# to avoid a test required by the libtool script that takes forever.
169_OPSYS_MAX_CMDLEN_CMD= /usr/sbin/sysctl -n kern.argmax 169_OPSYS_MAX_CMDLEN_CMD= /usr/sbin/sysctl -n kern.argmax
170 170
171# Darwin 7.7.x has poll() in libc, but no poll.h. Try to help GNU 171# Darwin 7.7.x has poll() in libc, but no poll.h. Try to help GNU
172# configure packages that break because of this by pretending that 172# configure packages that break because of this by pretending that
173# there is no poll(). 173# there is no poll().
174.if defined(GNU_CONFIGURE) 174.if defined(GNU_CONFIGURE)
175. if !exists(/usr/include/poll.h) && !exists(/usr/include/sys/poll.h) 175. if !exists(${_OPSYS_INCLUDE_DIRS}/poll.h) && !exists(${_OPSYS_INCLUDE_DIRS}/sys/poll.h)
176CONFIGURE_ENV+= ac_cv_func_poll=no 176CONFIGURE_ENV+= ac_cv_func_poll=no
177. endif 177. endif
178.endif 178.endif
179 179
180# If the deployment target is not set explicitly, the linker in Tiger and prior 180# If the deployment target is not set explicitly, the linker in Tiger and prior
181# versions running on PowerPC hosts defaults to a target of 10.1. 181# versions running on PowerPC hosts defaults to a target of 10.1.
182# Set the target for Tiger systems to be 10.4. 182# Set the target for Tiger systems to be 10.4.
183.if !empty(MACHINE_PLATFORM:MDarwin-8.*-powerpc) 183.if !empty(MACHINE_PLATFORM:MDarwin-8.*-powerpc)
184MAKE_ENV+= MACOSX_DEPLOYMENT_TARGET="10.4" 184MAKE_ENV+= MACOSX_DEPLOYMENT_TARGET="10.4"
185.endif 185.endif
186 186
187# El Capitan GM has a file system bug where a deep directory hierarchy can be 187# El Capitan GM has a file system bug where a deep directory hierarchy can be
188# created but not removed. Avoid running a test which does exactly this. 188# created but not removed. Avoid running a test which does exactly this.