From: Lucian Cristian <lucian.cristian@gmail.com>
Date: Sat, 23 May 2020 02:43:01 +0000 (+0300)
Subject: nss: fix build for mips64
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=46d315d31602efa4714762b24c7c42d5df86aea2;p=feed%2Fpackages.git

nss: fix build for mips64
disable arm32_neon on unsupported target

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
(cherry picked from commit d254f0527deb23e75f5100fd2159cf27b92dc966)
---

diff --git a/libs/nss/Makefile b/libs/nss/Makefile
index 962b8b7b16..aea986c798 100644
--- a/libs/nss/Makefile
+++ b/libs/nss/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nss
 PKG_VERSION:=3.52
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= \
@@ -62,8 +62,15 @@ ifeq ($(CONFIG_CPU_TYPE),"xscale")
 TARGET_CFLAGS+= -mfloat-abi=softfp
 endif
 
+ifneq ($(findstring arm,$(CONFIG_ARCH)),)
+ifeq ($(findstring neon,$(CONFIG_CPU_TYPE)),)
+export NSS_DISABLE_ARM32_NEON
+endif
+endif
+
 export NATIVE_CC=$(HOSTCC)
 export NATIVE_FLAGS=$(HOST_CFLAGS)
+export NSS_ENABLE_WERROR=0
 
 MAKE_FLAGS += \
 	CROSS_COMPILE=1 \
diff --git a/libs/nss/patches/003-openwrt_fix.patch b/libs/nss/patches/003-openwrt_fix.patch
index e3eb2ceddd..9f75850ff9 100644
--- a/libs/nss/patches/003-openwrt_fix.patch
+++ b/libs/nss/patches/003-openwrt_fix.patch
@@ -22,7 +22,7 @@
  
 --- a/nss/coreconf/arch.mk	2019-03-31 23:38:34.374931416 +0300
 +++ b/nss/coreconf/arch.mk	2019-03-31 23:38:44.667236102 +0300
-@@ -305,7 +305,7 @@
+@@ -334,7 +334,7 @@
      OBJDIR_NAME_COMPILER = $(COMPILER_TAG)
  endif
  OBJDIR_NAME_BASE = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(OBJDIR_NAME_COMPILER)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG)