From 35a032a00a64fe06d50e158761a1b0fb8517b797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 27 Jan 2021 08:48:38 +0700 Subject: [PATCH] nss: update to 3.61. --- srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch | 12 ++++++++++++ srcpkgs/nss/template | 6 ++++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch diff --git a/srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch b/srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch new file mode 100644 index 00000000000..72fc5252cde --- /dev/null +++ b/srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch @@ -0,0 +1,12 @@ +Index: nss/gtests/manifest.mn +=================================================================== +--- nss/gtests/manifest.mn.orig ++++ nss/gtests/manifest.mn +@@ -41,6 +41,7 @@ certdb_gtest: common + certhigh_gtest: common + cryptohi_gtest: common + der_gtest: common ++freebl_gtest: common + pk11_gtest: common pkcs11testmodule + smime_gtest: common + softoken_gtest: common diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index b203db3b956..fbcdc67dc58 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -3,7 +3,7 @@ _nsprver=4.29 pkgname=nss -version=3.60.1 +version=3.61 revision=1 hostmakedepends="perl" makedepends="nspr-devel sqlite-devel zlib-devel" @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="MPL-2.0" homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz" -checksum=2051c20b61112df24bad533ac37f6c66c1bc0d6ea70bb9d9cad102d20324279d +checksum=312e2d804b34ccf0fec70b57cf8cd6ac853f8ced60df53e30ebb0a7bcd0e1370 export NS_USE_GCC=1 export LIBRUNPATH= @@ -55,6 +55,8 @@ do_build() { make ${makejobs} LD=$BUILD_LD LDFLAGS="$BUILD_LDFLAGS" ${_native_use64} -C coreconf if [ "$CROSS_BUILD" ]; then + # We don't run test in cross build + export NSS_DISABLE_GTESTS=1 if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then CFLAGS+=" -DNS_PTR_GT_32" _target_use64="USE_64=1"