CVS commit: pkgsrc/devel/nss

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jul 10 05:13:47 UTC 2017

Modified Files:
        pkgsrc/devel/nss: Makefile

Log Message:
Honor LDFLAGS. Fix a pkglint warning for better ccache support.


To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 pkgsrc/devel/nss/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/nss/Makefile
diff -u pkgsrc/devel/nss/Makefile:1.136 pkgsrc/devel/nss/Makefile:1.137
--- pkgsrc/devel/nss/Makefile:1.136     Wed Jun 14 11:18:55 2017
+++ pkgsrc/devel/nss/Makefile   Mon Jul 10 05:13:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2017/06/14 11:18:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.137 2017/07/10 05:13:47 wiz Exp $
 
 DISTNAME=              nss-${NSS_RELEASE:S/.0$//}
 NSS_RELEASE=           3.31.0
@@ -49,7 +49,7 @@ SO_SUFFIX=            so.1.0
 .endif
 PLIST_SUBST+=          SO_SUFFIX=${SO_SUFFIX:Q}
 
-.if ${OPSYS} == "SunOS" && (${PKGSRC_COMPILER} == "clang" || ${PKGSRC_COMPILER} == "gcc")
+.if ${OPSYS} == "SunOS" && (${PKGSRC_COMPILER:Mclang} || ${PKGSRC_COMPILER:Mgcc})
 MAKE_ENV+=     NS_USE_GCC=YES
 .endif
 
@@ -73,7 +73,7 @@ MAKE_ENV+=    INCLUDES=-I${BUILDLINK_PREFIX
 MAKE_ENV+=     NSS_USE_SYSTEM_SQLITE=1
 MAKE_ENV+=     ZLIB_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -L${BUILDLINK_PREFIX.zlib}/lib -lz"
 MAKE_ENV+=     USE_SYSTEM_ZLIB=1
-MAKE_ENV+=     EXTRA_SHARED_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss -L${BUILDLINK_PREFIX.nspr}/lib/nspr -lplc4 -lplds4 -lnspr4"
+MAKE_ENV+=     EXTRA_SHARED_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss -L${BUILDLINK_PREFIX.nspr}/lib/nspr -lplc4 -lplds4 -lnspr4 
"${LDFLAGS:Q}
 MAKE_ENV+=     NSS_DISABLE_GTESTS=yes
 MAKE_ENV+=     NSS_ENABLE_TLS_1_3=1
 .include "../../mk/compiler.mk"