From f3ded751c269c689e712c431e1c5f3e57aaacb02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 25 Jun 2022 21:43:24 +0700 Subject: [PATCH] nss: update to 3.80. --- srcpkgs/nss/patches/native-nsinstall-cflags.patch | 9 ++++----- srcpkgs/nss/template | 8 +++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/nss/patches/native-nsinstall-cflags.patch b/srcpkgs/nss/patches/native-nsinstall-cflags.patch index e2734e700d4..249d281becf 100644 --- a/srcpkgs/nss/patches/native-nsinstall-cflags.patch +++ b/srcpkgs/nss/patches/native-nsinstall-cflags.patch @@ -1,11 +1,10 @@ ---- nss-3.68.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.68/nss/coreconf/nsinstall/Makefile -@@ -32,6 +32,8 @@ endif +--- nss-3.80.orig/nss/coreconf/nsinstall/Makefile ++++ nss-3.80/nss/coreconf/nsinstall/Makefile +@@ -32,6 +32,7 @@ endif ifdef NATIVE_FLAGS OS_CFLAGS=$(NATIVE_FLAGS) +XCFLAGS = $(NATIVE_FLAGS) -+LDFLAGS = $(LDFLAGS_FOR_BUILD) endif - include $(DEPTH)/coreconf/rules.mk + ifdef NATIVE_LDFLAGS diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index 7ea39f1c318..0d9c200fe63 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -3,7 +3,7 @@ _nsprver=4.34 pkgname=nss -version=3.79 +version=3.80 revision=1 hostmakedepends="perl which" 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=ebdf2d6a96613b6fe70ad579e9f983e0e94e0110171cfb2999db633d3394a514 +checksum=c0bf1fd2c7e29a6b02b309622baafc443eec90c8934bb155da4bb98988784b6a export NS_USE_GCC=1 export LIBRUNPATH= @@ -60,7 +60,9 @@ do_build() { export XCFLAGS="${CFLAGS}" make -C nss ${makejobs} \ ${CROSS_BUILD:+CROSS_COMPILE=1} OS_TEST="${_ARCH}" \ - NATIVE_CC="${BUILD_CC}" NATIVE_FLAGS="${BUILD_CFLAGS}" \ + NATIVE_CC="${CC_FOR_BUILD}" \ + NATIVE_FLAGS="${CFLAGS_FOR_BUILD}" \ + NATIVE_LDFLAGS="${LDFLAGS_FOR_BUILD}" \ CCC="$CXX" ${_use64} \ all }