diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index fa3f73e3289..781d29d83cc 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -1,9 +1,9 @@ # Template file for 'nss' -_nsprver=4.23 +_nsprver=4.24 pkgname=nss -version=3.47.1 +version=3.48 revision=1 hostmakedepends="perl" makedepends="nspr-devel sqlite-devel zlib-devel" @@ -13,11 +13,12 @@ maintainer="Doan Tran Cong Danh " license="MPL-2.0" homepage="https://www.mozilla.org/projects/security/pki/nss" distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz" -checksum=1ae3d1cb1de345b258788f2ef6b10a460068034c3fd64f42427a183d8342a6fb +checksum=3f9c822a86a4e3e1bfe63e2ed0f922d8b7c2e0b7cafe36774b1c627970d0f8ac do_build() { # Respect LDFLAGS - sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' -i nss/coreconf/rules.mk + vsed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ + -i nss/coreconf/rules.mk export LIBRUNPATH= export BUILD_OPT=1 @@ -25,6 +26,8 @@ do_build() { export NSS_ENABLE_WERROR=0 export NSS_ENABLE_ECC=1 export FREEBL_NO_DEPEND=1 + export NATIVE_CC="$BUILD_CC" + export NATIVE_FLAGS="$BUILD_CFLAGS" case "$XBPS_MACHINE" in aarch64*|x86_64*|ppc64*) _native_use64="USE_64=1";; @@ -32,8 +35,7 @@ do_build() { cd nss # Build nsinstall for host. - make CC=$BUILD_CC LD=$BUILD_LD CFLAGS="$BUILD_CFLAGS" LDFLAGS="$BUILD_LDFLAGS" \ - ${_native_use64} -C coreconf + make LD=$BUILD_LD LDFLAGS="$BUILD_LDFLAGS" ${_native_use64} -C coreconf if [ "$CROSS_BUILD" ]; then case "$XBPS_TARGET_MACHINE" in @@ -67,6 +69,26 @@ do_build() { fi } +do_check() { + export LIBRUNPATH= + export BUILD_OPT=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_WERROR=0 + export NSS_ENABLE_ECC=1 + export FREEBL_NO_DEPEND=1 + export NATIVE_CC="$BUILD_CC" + export NATIVE_FLAGS="$BUILD_CFLAGS" + # We couldn't run test in cross compile! + export NSPR_INCLUDE_DIR=/usr/include/nspr + export NSPR_LIB_DIR=/usr/lib + export XCFLAGS="${CFLAGS}" + case "$XBPS_MACHINE" in + aarch64*|x86_64*|ppc64*) _use_64="USE_64=1";; + esac + cd nss/tests + env $_use_64 HOST=localhost DOMSUF=localdomain ./all.sh +} + do_install() { vmkdir usr/lib/pkgconfig vmkdir usr/bin