diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2013-07-10 15:52:42 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-13 18:23:35 +0100 |
commit | e448ef66980895d00bbc721a2bd1a3926baa1edd (patch) | |
tree | f1f284e5757940b3432980b0041e5b24ad06fe74 /meta/recipes-support/nss/files | |
parent | 9781b0dbef3e124115c7fadfdb34a31b73b14185 (diff) | |
download | poky-e448ef66980895d00bbc721a2bd1a3926baa1edd.tar.gz |
nss: add version 3.15.1
Network Security Services (NSS) is a set of libraries designed to support
cross-platform development of security-enabled client and server applications.
Applications built with NSS can support SSL v2 and v3, TLS, PKCS 5, PKCS 7,
PKCS 11, PKCS 12, S/MIME, X.509 v3 certificates, and other security standards.
[YOCTO #4096]
(From OE-Core rev: 22c146fd3e829b89c07a2019005e180e93fece5d)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nss/files')
3 files changed, 108 insertions, 0 deletions
diff --git a/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch new file mode 100644 index 0000000000..f0b3550bff --- /dev/null +++ b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch | |||
@@ -0,0 +1,71 @@ | |||
1 | nss: fix support cross compiling | ||
2 | |||
3 | Let some make variables be assigned from outside makefile. | ||
4 | |||
5 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | --- | ||
8 | nss/coreconf/Linux.mk | 12 +++++++++++- | ||
9 | nss/coreconf/arch.mk | 2 +- | ||
10 | nss/lib/freebl/Makefile | 6 ++++++ | ||
11 | 3 files changed, 18 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk | ||
14 | --- a/nss/coreconf/Linux.mk | ||
15 | +++ b/nss/coreconf/Linux.mk | ||
16 | @@ -16,11 +16,21 @@ ifeq ($(USE_PTHREADS),1) | ||
17 | IMPL_STRATEGY = _PTH | ||
18 | endif | ||
19 | |||
20 | +ifndef CC | ||
21 | CC = gcc | ||
22 | +endif | ||
23 | + | ||
24 | +ifdef CXX | ||
25 | +CCC = $(CXX) | ||
26 | +else | ||
27 | CCC = g++ | ||
28 | +endif | ||
29 | + | ||
30 | +ifndef RANLIB | ||
31 | RANLIB = ranlib | ||
32 | +endif | ||
33 | |||
34 | -DEFAULT_COMPILER = gcc | ||
35 | +DEFAULT_COMPILER = $(CC) | ||
36 | |||
37 | ifeq ($(OS_TARGET),Android) | ||
38 | ifndef ANDROID_NDK | ||
39 | diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk | ||
40 | index 6557348..b722412 100644 | ||
41 | --- a/nss/coreconf/arch.mk | ||
42 | +++ b/nss/coreconf/arch.mk | ||
43 | @@ -37,7 +37,7 @@ OS_TEST := $(shell uname -m) | ||
44 | ifeq ($(OS_TEST),i86pc) | ||
45 | OS_RELEASE := $(shell uname -r)_$(OS_TEST) | ||
46 | else | ||
47 | - OS_RELEASE := $(shell uname -r) | ||
48 | + OS_RELEASE ?= $(shell uname -r) | ||
49 | endif | ||
50 | |||
51 | # | ||
52 | diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile | ||
53 | index 0d293f1..678f506 100644 | ||
54 | --- a/nss/lib/freebl/Makefile | ||
55 | +++ b/nss/lib/freebl/Makefile | ||
56 | @@ -36,6 +36,12 @@ ifdef USE_64 | ||
57 | DEFINES += -DNSS_USE_64 | ||
58 | endif | ||
59 | |||
60 | +ifeq ($(OS_TEST),mips) | ||
61 | +ifndef USE_64 | ||
62 | + DEFINES += -DNS_PTR_LE_32 | ||
63 | +endif | ||
64 | +endif | ||
65 | + | ||
66 | ifdef USE_ABI32_FPU | ||
67 | DEFINES += -DNSS_USE_ABI32_FPU | ||
68 | endif | ||
69 | -- | ||
70 | 1.8.1.2 | ||
71 | |||
diff --git a/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch new file mode 100644 index 0000000000..7661dc93a0 --- /dev/null +++ b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | nss:no rpath for cross compiling | ||
2 | |||
3 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
4 | Upstream-Status: Inappropriate [configuration] | ||
5 | --- | ||
6 | nss/cmd/platlibs.mk | 4 ++-- | ||
7 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
8 | |||
9 | diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk | ||
10 | --- a/nss/cmd/platlibs.mk | ||
11 | +++ b/nss/cmd/platlibs.mk | ||
12 | @@ -18,9 +18,9 @@ endif | ||
13 | |||
14 | ifeq ($(OS_ARCH), Linux) | ||
15 | ifeq ($(USE_64), 1) | ||
16 | -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' | ||
17 | +#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' | ||
18 | else | ||
19 | -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' | ||
20 | +#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' | ||
21 | endif | ||
22 | endif | ||
23 | |||
24 | -- | ||
25 | 1.8.1.2 | ||
26 | |||
diff --git a/meta/recipes-support/nss/files/nss.pc.in b/meta/recipes-support/nss/files/nss.pc.in new file mode 100644 index 0000000000..200f635c65 --- /dev/null +++ b/meta/recipes-support/nss/files/nss.pc.in | |||
@@ -0,0 +1,11 @@ | |||
1 | prefix=OEPREFIX | ||
2 | exec_prefix=OEEXECPREFIX | ||
3 | libdir=OELIBDIR | ||
4 | includedir=OEINCDIR | ||
5 | |||
6 | Name: NSS | ||
7 | Description: Network Security Services | ||
8 | Version: %NSS_VERSION% | ||
9 | Requires: nspr >= %NSPR_VERSION% | ||
10 | Libs: -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 | ||
11 | Cflags: -IOEINCDIR | ||