summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/nss/nss
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2015-01-21 23:48:21 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:48 +0000
commit5db14d5cf39135eea7d64a83e1ef0061909ff9d7 (patch)
treed3f7f47338a918f381505aa4a47842821d505aa8 /meta/recipes-support/nss/nss
parentdacbc744bfee42a9d7f7090c224c19798d6c5173 (diff)
downloadpoky-5db14d5cf39135eea7d64a83e1ef0061909ff9d7.tar.gz
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>
Diffstat (limited to 'meta/recipes-support/nss/nss')
-rw-r--r--meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
new file mode 100644
index 0000000000..866de07ea8
--- /dev/null
+++ b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
@@ -0,0 +1,35 @@
1Fix nss multilib build on openSUSE 11.x 32bit
2
3While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will
4fail with error:
5
6* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled
7
8It caused by the '-m64' option which passed to host gcc.
9
10The nsinstall was built first while nss starting to build, it only runs
11on host to install built files, it doesn't need any cross-compling or
12multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this
13error.
14
15Upstream-Status: Pending
16
17Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
18===================================================
19diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile
20index 1850bcb..5aee84f 100644
21--- a/nss/coreconf/nsinstall/Makefile
22+++ b/nss/coreconf/nsinstall/Makefile
23@@ -18,6 +18,12 @@ INTERNAL_TOOLS = 1
24
25 include $(DEPTH)/coreconf/config.mk
26
27+# nsinstall is unfit for cross-compiling/multilib-build since it was
28+# always run on local host to install built files. This change intends
29+# to clean the '-m64' from ARCHFLAG and LDFLAGS.
30+ARCHFLAG =
31+LDFLAGS =
32+
33 ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
34 PROGRAM =
35 else