summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/nss/Makefile14
-rw-r--r--package/nss/patches/patch-nss_coreconf_Linux_mk10
2 files changed, 12 insertions, 12 deletions
diff --git a/package/nss/Makefile b/package/nss/Makefile
index c3af7851e..1fe6b2b31 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -4,11 +4,11 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= nss
-PKG_VERSION:= 3.23
+PKG_VERSION:= 3.27.1
PKG_RELEASE:= 1
PKG_MAJ_VERSION:= 3
-PKG_MIN_VERSION:= 23
-PKG_HASH:= 94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf
+PKG_MIN_VERSION:= 27_1
+PKG_HASH:= fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b
PKG_DESCR:= network security services library
PKG_SECTION:= libs/crypto
PKG_BUILDDEP:= nspr zlib sqlite
@@ -42,14 +42,14 @@ TARGET_CFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/nspr
XAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist
XAKE_FLAGS+= ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
-XAKE_FLAGS+= NSS_DISABLE_DBM=1 OS_TEST=${ADK_TARGET_CPU_ARCH} OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux
-XAKE_FLAGS+= ARTOOL="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib" NSS_USE_SYSTEM_SQLITE=1
-XAKE_FLAGS+= NSS_USE_SYSTEM_ZLIB=1
+XAKE_FLAGS+= OS_TEST=${ADK_TARGET_CPU_ARCH} OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux
+XAKE_FLAGS+= ARTOOL="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib"
+XAKE_FLAGS+= NSS_USE_SYSTEM_ZLIB=1 NSS_ENABLE_WERROR=0 NSS_DISABLE_DBM=1 NSS_USE_SYSTEM_SQLITE=1
ALL_TARGET:= all
do-install:
$(INSTALL_DIR) $(IDIR_NSS)/usr/lib
- ${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{nsssysinit,nssckbi,freebl3,ssl3,smime3,nss3,nssutil3,softokn3}.so \
+ ${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{nsssysinit,nssckbi,freebl3,freeblpriv3,ssl3,smime3,nss3,nssutil3,softokn3}.so \
$(IDIR_NSS)/usr/lib
${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/include/nss
${INSTALL_DATA} ${WRKDIST}/dist/public/nss/* \
diff --git a/package/nss/patches/patch-nss_coreconf_Linux_mk b/package/nss/patches/patch-nss_coreconf_Linux_mk
index 6b8229f60..4b9b1ad5a 100644
--- a/package/nss/patches/patch-nss_coreconf_Linux_mk
+++ b/package/nss/patches/patch-nss_coreconf_Linux_mk
@@ -1,5 +1,5 @@
---- nss-3.23.orig/nss/coreconf/Linux.mk 2016-02-26 21:51:11.000000000 +0100
-+++ nss-3.23/nss/coreconf/Linux.mk 2016-03-12 19:34:11.236877389 +0100
+--- nss-3.26.1.orig/nss/coreconf/Linux.mk 2016-09-26 18:31:01.000000000 +0200
++++ nss-3.26.1/nss/coreconf/Linux.mk 2016-10-02 11:09:15.042562528 +0200
@@ -16,9 +16,9 @@ ifeq ($(USE_PTHREADS),1)
IMPL_STRATEGY = _PTH
endif
@@ -13,10 +13,10 @@
DEFAULT_COMPILER = gcc
-@@ -155,7 +155,7 @@ DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,--
- # we don't use -z defs there.
- ZDEFS_FLAG = -Wl,-z,defs
+@@ -159,7 +159,7 @@ ZDEFS_FLAG = -Wl,-z,defs
+ ifneq ($(USE_ASAN),1)
DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
+ endif
-LDFLAGS += $(ARCHFLAG)
+#LDFLAGS += $(ARCHFLAG)