CVS commit: pkgsrc/devel/nspr

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Sep 20 20:01:20 UTC 2020

Modified Files:
        pkgsrc/devel/nspr: Makefile

Log Message:
Don't pass "--with-macos-sdk=/nonexistent". Fixes this error on Catalina
with Xcode 12:

configure: error: SDK not found.  When using --with-macos-sdk, you must
specify a valid SDK.  SDKs are installed when the optional cross-development
tools are selected during the Xcode/Developer Tools installation.

While here, merge some of the Darwin conditional logic.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/devel/nspr/Makefile

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

Modified files:

Index: pkgsrc/devel/nspr/Makefile
diff -u pkgsrc/devel/nspr/Makefile:1.108 pkgsrc/devel/nspr/Makefile:1.109
--- pkgsrc/devel/nspr/Makefile:1.108    Sat Sep 19 23:53:09 2020
+++ pkgsrc/devel/nspr/Makefile  Sun Sep 20 20:01:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2020/09/19 23:53:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.109 2020/09/20 20:01:19 schmonz Exp $
 
 DISTNAME=      nspr-${NSPR_RELEASE:S/.0$//}
 NSPR_RELEASE=  4.29.0
@@ -85,15 +85,12 @@ CONFIGURE_ARGS+=    --enable-64bit
 .endif
 
 .if ${OPSYS} == "Darwin"
-# Avoid using invalid deployment targets.
-CONFIGURE_ARGS+=       --with-macos-sdk=/nonexistent
 .  if defined(ABI) && ${ABI} == "64"
 CONFIGURE_ARGS+=       --enable-64bit
 .  endif
-.endif
-
-.if ${OPSYS} == "Darwin" && exists(/Developer/Headers/FlatCarbon)
+.  if exists(/Developer/Headers/FlatCarbon)
 BUILDLINK_PASSTHRU_DIRS+=      Developer/Headers/FlatCarbon
+.  endif
 .endif
 
 pre-configure: