pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/platform Cache and use computed variables.
details: https://anonhg.NetBSD.org/pkgsrc/rev/65f71f5049a7
branches: trunk
changeset: 357259:65f71f5049a7
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Tue Jan 17 15:32:17 2017 +0000
description:
Cache and use computed variables.
diffstat:
mk/platform/Darwin.mk | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (37 lines):
diff -r 7467c1e27ddb -r 65f71f5049a7 mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk Tue Jan 17 15:25:27 2017 +0000
+++ b/mk/platform/Darwin.mk Tue Jan 17 15:32:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.85 2016/11/13 11:06:40 jdolecek Exp $
+# $NetBSD: Darwin.mk,v 1.86 2017/01/17 15:32:17 jperkin Exp $
#
# Variable definitions for the Darwin operating system.
@@ -81,11 +81,13 @@
_OPSYS_SYSTEM_RPATH?= /usr/lib
_OPSYS_LIB_DIRS?= /usr/lib
+.if !defined(OSX_VERSION)
OSX_VERSION!= sw_vers -productVersion
. if ${OSX_VERSION:R:R} != ${OSX_VERSION:R}
OSX_VERSION:= ${OSX_VERSION:R}
. endif
MAKEFLAGS+= OSX_VERSION=${OSX_VERSION:Q}
+.endif
#
# From Xcode 5 onwards system headers are no longer installed by default
@@ -97,10 +99,12 @@
.if exists(/usr/include/stdio.h)
_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
+MAKEFLAGS+= OSX_SDK_PATH=${OSX_SDK_PATH:Q}
+. endif
. if exists(${OSX_SDK_PATH}/usr/include/stdio.h)
_OPSYS_INCLUDE_DIRS?= ${OSX_SDK_PATH}/usr/include
-MAKEFLAGS+= OSX_SDK_PATH=${OSX_SDK_PATH:Q}
. else
PKG_FAIL_REASON+= "No suitable Xcode SDK or Command Line Tools installed."
. endif
Home |
Main Index |
Thread Index |
Old Index