nss: update package to 3.17.3 and build fix
Update includes: CVE-2014-1569 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-1569 for changelog information see https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.17.3_release_notes We had a build failure on 32 bit hosts so including a patch from: http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mhatle/dora-misc Wenzong Fan (1): nss: workaround multilib build on 32bit host (From OE-Core rev: ccb86249b2b29686303ed04aac74887f0fa490df) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
dacbc744bf
commit
5db14d5cf3
|
@ -16,6 +16,7 @@ SRC_URI = "\
|
|||
file://nss-fix-support-cross-compiling.patch \
|
||||
file://nss-no-rpath-for-cross-compiling.patch \
|
||||
file://nss-fix-incorrect-shebang-of-perl.patch \
|
||||
file://nss-fix-nsinstall-build.patch \
|
||||
"
|
||||
SRC_URI_append = "\
|
||||
file://nss.pc.in \
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
Fix nss multilib build on openSUSE 11.x 32bit
|
||||
|
||||
While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will
|
||||
fail with error:
|
||||
|
||||
* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled
|
||||
|
||||
It caused by the '-m64' option which passed to host gcc.
|
||||
|
||||
The nsinstall was built first while nss starting to build, it only runs
|
||||
on host to install built files, it doesn't need any cross-compling or
|
||||
multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this
|
||||
error.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
===================================================
|
||||
diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile
|
||||
index 1850bcb..5aee84f 100644
|
||||
--- a/nss/coreconf/nsinstall/Makefile
|
||||
+++ b/nss/coreconf/nsinstall/Makefile
|
||||
@@ -18,6 +18,12 @@ INTERNAL_TOOLS = 1
|
||||
|
||||
include $(DEPTH)/coreconf/config.mk
|
||||
|
||||
+# nsinstall is unfit for cross-compiling/multilib-build since it was
|
||||
+# always run on local host to install built files. This change intends
|
||||
+# to clean the '-m64' from ARCHFLAG and LDFLAGS.
|
||||
+ARCHFLAG =
|
||||
+LDFLAGS =
|
||||
+
|
||||
ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
|
||||
PROGRAM =
|
||||
else
|
|
@ -1,8 +0,0 @@
|
|||
require nss.inc
|
||||
|
||||
SRC_URI += "\
|
||||
http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_2_RTM/src/${BPN}-${PV}.tar.gz \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "d3edb6f6c3688b2fde67ec9c9a8c1214"
|
||||
SRC_URI[sha256sum] = "134929e44e44b968a4883f4ee513a71ae45d55b486cee41ee8e26c3cc84dab8b"
|
|
@ -0,0 +1,7 @@
|
|||
require nss.inc
|
||||
|
||||
SRC_URI += "\
|
||||
http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_3_RTM/src/${BP}.tar.gz \
|
||||
"
|
||||
SRC_URI[md5sum] = "fba7489e1b26f2a0bfe5527430fd61e1"
|
||||
SRC_URI[sha256sum] = "f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5"
|
Loading…
Reference in New Issue