Sun Sep 20 20:01:20 2020 UTC ()
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.


(schmonz)
diff -r1.108 -r1.109 pkgsrc/devel/nspr/Makefile
cvs diff -r1.108 -r1.109 pkgsrc/devel/nspr/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/nspr/Makefile 2020/09/19 23:53:09 1.108
+++ pkgsrc/devel/nspr/Makefile 2020/09/20 20:01:19 1.109
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.108 2020/09/19 23:53:09 ryoon Exp $ 1# $NetBSD: Makefile,v 1.109 2020/09/20 20:01:19 schmonz Exp $
2 2
3DISTNAME= nspr-${NSPR_RELEASE:S/.0$//} 3DISTNAME= nspr-${NSPR_RELEASE:S/.0$//}
4NSPR_RELEASE= 4.29.0 4NSPR_RELEASE= 4.29.0
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${NSPR_RELEASE:S/.0$//}/src/} 6MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${NSPR_RELEASE:S/.0$//}/src/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR 9HOMEPAGE= https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR
10COMMENT= Platform-neutral API for system level and libc like functions 10COMMENT= Platform-neutral API for system level and libc like functions
11LICENSE= mpl-2.0 11LICENSE= mpl-2.0
12 12
13CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 13CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
14CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 14CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
@@ -75,35 +75,32 @@ HW_CLASS!= ${UNAME} -m @@ -75,35 +75,32 @@ HW_CLASS!= ${UNAME} -m
75. if ${HW_CLASS} == "sun4u" 75. if ${HW_CLASS} == "sun4u"
76PLIST.sun4u_32= yes 76PLIST.sun4u_32= yes
77. endif 77. endif
78. endif 78. endif
79.endif 79.endif
80 80
81.if ${OPSYS} == "Linux" 81.if ${OPSYS} == "Linux"
82. if defined(ABI) && ${ABI} == "64" 82. if defined(ABI) && ${ABI} == "64"
83CONFIGURE_ARGS+= --enable-64bit 83CONFIGURE_ARGS+= --enable-64bit
84. endif 84. endif
85.endif 85.endif
86 86
87.if ${OPSYS} == "Darwin" 87.if ${OPSYS} == "Darwin"
88# Avoid using invalid deployment targets. 
89CONFIGURE_ARGS+= --with-macos-sdk=/nonexistent 
90. if defined(ABI) && ${ABI} == "64" 88. if defined(ABI) && ${ABI} == "64"
91CONFIGURE_ARGS+= --enable-64bit 89CONFIGURE_ARGS+= --enable-64bit
92. endif 90. endif
93.endif 91. if exists(/Developer/Headers/FlatCarbon)
94 
95.if ${OPSYS} == "Darwin" && exists(/Developer/Headers/FlatCarbon) 
96BUILDLINK_PASSTHRU_DIRS+= Developer/Headers/FlatCarbon 92BUILDLINK_PASSTHRU_DIRS+= Developer/Headers/FlatCarbon
 93. endif
97.endif 94.endif
98 95
99pre-configure: 96pre-configure:
100 cd ${WRKSRC}/nspr && autoconf 97 cd ${WRKSRC}/nspr && autoconf
101 98
102post-build: 99post-build:
103 set -e; ( \ 100 set -e; ( \
104 ${ECHO} "Name: NSPR"; \ 101 ${ECHO} "Name: NSPR"; \
105 ${ECHO} "Description: The Netscape Portable Runtime"; \ 102 ${ECHO} "Description: The Netscape Portable Runtime"; \
106 ${ECHO} "Version: ${NSPR_RELEASE}"; \ 103 ${ECHO} "Version: ${NSPR_RELEASE}"; \
107 ${ECHO} "Cflags: -I${PREFIX}/include/nspr"; \ 104 ${ECHO} "Cflags: -I${PREFIX}/include/nspr"; \
108 ${ECHO} "Libs: -L${PREFIX}/lib/nspr" \ 105 ${ECHO} "Libs: -L${PREFIX}/lib/nspr" \
109 "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nspr" \ 106 "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nspr" \