pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/nss Honor LDFLAGS. Fix a pkglint warning for bet...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6f452e2e767d
branches: trunk
changeset: 365069:6f452e2e767d
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Jul 10 05:13:47 2017 +0000
description:
Honor LDFLAGS. Fix a pkglint warning for better ccache support.
diffstat:
devel/nss/Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r 9d4567d4c0f6 -r 6f452e2e767d devel/nss/Makefile
--- a/devel/nss/Makefile Mon Jul 10 03:20:57 2017 +0000
+++ b/devel/nss/Makefile Mon Jul 10 05:13:47 2017 +0000
@@ -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 @@
.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+= 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"
Home |
Main Index |
Thread Index |
Old Index