CVS commit: pkgsrc/mk/platform

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Oct  9 17:43:48 UTC 2020

Modified Files:
        pkgsrc/mk/platform: Darwin.mk

Log Message:
mk: Set _OPSYS_LIB_DIRS to the SDK directory on Big Sur.

This is required for find-libs.mk to continue detecting the presence of
libraries supported by the system.  It's definitely not ideal, and only
still works because Apple happens to ship .tdb files for each library, and
these are found via the current "lib${_lib_}.*" glob.

Patch taken from sjmulder@, I only limited it to Big Sur for now in case
there are issues using the SDK directory on older releases.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 pkgsrc/mk/platform/Darwin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/platform/Darwin.mk
diff -u pkgsrc/mk/platform/Darwin.mk:1.99 pkgsrc/mk/platform/Darwin.mk:1.100
--- pkgsrc/mk/platform/Darwin.mk:1.99   Fri Oct  9 16:00:16 2020
+++ pkgsrc/mk/platform/Darwin.mk        Fri Oct  9 17:43:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.99 2020/10/09 16:00:16 jperkin Exp $
+# $NetBSD: Darwin.mk,v 1.100 2020/10/09 17:43:48 jperkin Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -85,7 +85,6 @@ _USER_DEPENDS=                user-darwin>=20130712:..
 _OPSYS_EMULDIR.darwin= # empty
 
 _OPSYS_SYSTEM_RPATH?=  /usr/lib
-_OPSYS_LIB_DIRS?=      /usr/lib
 
 .if !defined(OSX_VERSION)
 OSX_VERSION!=          sw_vers -productVersion
@@ -124,10 +123,16 @@ PKG_FAIL_REASON+= "No suitable Xcode SDK
 # Newer macOS releases remove library files from the file system.  The only way
 # to test them is via dlopen(), which is obviously impractical for many things.
 #
-# This define turns off anything that can't reasonably supported this.
+# The DARWIN_NO_SYSTEM_LIBS define turns off anything that can't reasonably
+# support this.  We also need to set _OPSYS_LIB_DIRS for find-libs.mk to look
+# in the SDK directory.  It may be that this can be set for all versions, but
+# for now keep the legacy behaviour and limit it to Big Sur onwards only.
 #
 .if ${OS_VERSION:R} >= 20
 DARWIN_NO_SYSTEM_LIBS= # defined
+_OPSYS_LIB_DIRS?=      ${OSX_SDK_PATH}/usr/lib
+.else
+_OPSYS_LIB_DIRS?=      /usr/lib
 .endif
 
 .if ${OS_VERSION:R} >= 6