diff options
| author | tnn <tnn@pkgsrc.org> | 2016-03-09 05:39:12 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2016-03-09 05:39:12 +0000 |
| commit | c3ef1339b479e02e2332cdbbb7d170739dd29848 (patch) | |
| tree | e2a8750bd728926e57120f1e34bcb191994aa713 /devel/nss | |
| parent | 4a7fb119f7050a9537875769b81ab097fed71c96 (diff) | |
| download | pkgsrc-c3ef1339b479e02e2332cdbbb7d170739dd29848.tar.gz | |
Don't arbitrarily use bundled zlib on some platforms and system's on others.
We do include zlib.buildlink3.mk, so make sure we always use that zlib.
Remove manual do-build target and set BUILD_DIRS instead.
Set MAKE_JOBS_SAFE=no. The previous do-build target didn't respect MAKE_JOBS.
Bump PKGREVISON.
Diffstat (limited to 'devel/nss')
| -rw-r--r-- | devel/nss/Makefile | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/devel/nss/Makefile b/devel/nss/Makefile index 30b8f65a5c8..2a718900bd5 100644 --- a/devel/nss/Makefile +++ b/devel/nss/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.109 2016/03/07 12:31:17 ryoon Exp $ +# $NetBSD: Makefile,v 1.110 2016/03/09 05:39:12 tnn Exp $ DISTNAME= nss-${NSS_RELEASE:S/.0$//} NSS_RELEASE= 3.22.2 +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_RELEASE:S/.0$//:S/./_/g}_RTM/src/} @@ -17,6 +18,7 @@ CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}configure USE_GCC_RUNTIME= yes USE_TOOLS+= gmake perl pax pkg-config +MAKE_JOBS_SAFE= no .include "../../mk/bsd.prefs.mk" @@ -26,6 +28,12 @@ SUBST_MESSAGE.exec_path= Fixing @executable_path SUBST_FILES.exec_path= nss/coreconf/Darwin.mk SUBST_SED.exec_path= -e 's,@executable_path,${PREFIX}/lib/nss,g' +SUBST_CLASSES+= zlib +SUBST_STAGE.zlib= pre-configure +SUBST_MESSAGE.zlib= Use ZLIB_LIBS from environment +SUBST_FILES.zlib= nss/coreconf/*.mk +SUBST_SED.zlib= -e 's,^ZLIB_LIBS,\#ZLIB_LIBS,g' + BUILDLINK_TRANSFORM+= rm:-Werror BUILDLINK_TRANSFORM+= rm:-ansi @@ -54,7 +62,9 @@ MAKE_ENV+= BUILD_OPT=1 #MAKE_ENV+= OPTIMIZER=${CFLAGS:Q} MAKE_ENV+= INCLUDES=-I${BUILDLINK_PREFIX.nspr}/include/nspr MAKE_ENV+= NSS_USE_SYSTEM_SQLITE=1 -MAKE_ENV+= EXTRA_SHARED_LIBS="-Wl,-R${BUILDLINK_PREFIX.nspr}/lib/nspr -Wl,-R,${PREFIX}/lib/nss -L${BUILDLINK_PREFIX.nspr}/lib/nspr -lplc4 -lplds4 -lnspr4" +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+= NSS_DISABLE_GTESTS=yes .include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-4.[0-7]*) @@ -65,9 +75,7 @@ post-extract: find ${WRKSRC} -type f | xargs ${CHMOD} 644 find ${WRKSRC} -type d | xargs ${CHMOD} 755 -do-build: - cd ${WRKSRC}/nss && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all - +BUILD_DIRS= nss INSTALLATION_DIRS= include/nss lib/nss lib/pkgconfig DIST= ${WRKSRC}/dist |