Received: by mail.netbsd.org (Postfix, from userid 605) id 6B06884E7D; Thu, 8 Nov 2018 22:18:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5CEF884E80 for ; Thu, 8 Nov 2018 22:18:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id IsI_dCsCspVF for ; Thu, 8 Nov 2018 22:18:14 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7D7CA84E78 for ; Thu, 8 Nov 2018 22:18:14 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 74DFBFB1F; Thu, 8 Nov 2018 22:18:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_154171549437250" MIME-Version: 1.0 Date: Thu, 8 Nov 2018 22:18:14 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mk/platform To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20181108221814.74DFBFB1F@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_154171549437250 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Thu Nov 8 22:18:14 UTC 2018 Modified Files: pkgsrc/mk/platform: Darwin.mk Log Message: Add OSX_TOLERATE_SDK_SKEW to control whether we try to find an unversioned SDK if the versioned lookup fails. Off by default, as before; must be explicitly enabled, as suggested by gdt@. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 pkgsrc/mk/platform/Darwin.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_154171549437250 Content-Disposition: inline Content-Length: 1268 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.89 pkgsrc/mk/platform/Darwin.mk:1.90 --- pkgsrc/mk/platform/Darwin.mk:1.89 Wed Nov 7 16:50:27 2018 +++ pkgsrc/mk/platform/Darwin.mk Thu Nov 8 22:18:14 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.89 2018/11/07 16:50:27 schmonz Exp $ +# $NetBSD: Darwin.mk,v 1.90 2018/11/08 22:18:14 schmonz Exp $ # # Variable definitions for the Darwin operating system. @@ -96,12 +96,13 @@ MAKEFLAGS+= OSX_VERSION=${OSX_VERSION:Q # # Use current system version SDK (avoid newer SDKs). # -.if exists(/usr/include/stdio.h) +.if exists(/usr/include/stdioooo.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 -. if ${OSX_SDK_PATH} == "/nonexistent" +OSX_SDK_PATH!= /usr/bin/xcrun --sdk macosx${OSX_VERSION}3 --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} --_----------=_154171549437250--