diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-02-22 16:51:18 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 23:27:09 +0000 |
commit | 9e6cb6ec8b4b1d66b1e626f175946d15c1a2b49c (patch) | |
tree | bc93585d9e0a199667d0f96251c3f98889040f54 /meta/recipes-support/nss/nss | |
parent | 1f17010446a91f45b728aa3569e6f7671d1ca4b8 (diff) | |
download | poky-9e6cb6ec8b4b1d66b1e626f175946d15c1a2b49c.tar.gz |
nss: update to 3.28.1
Rebase nss-fix-support-cross-compiling.patch
(From OE-Core rev: f65baebafc3d1389c5e5000c6cd921b7569123a1)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.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/0001-nss-fix-support-cross-compiling.patch | 48 | ||||
-rw-r--r-- | meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch | 71 |
2 files changed, 48 insertions, 71 deletions
diff --git a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch new file mode 100644 index 0000000000..d5403397e7 --- /dev/null +++ b/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 22 Feb 2017 11:36:11 +0200 | ||
4 | Subject: [PATCH] nss: fix support cross compiling | ||
5 | |||
6 | Let some make variables be assigned from outside makefile. | ||
7 | |||
8 | Upstream-Status: Inappropriate [configuration] | ||
9 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | nss/coreconf/arch.mk | 2 +- | ||
13 | nss/lib/freebl/Makefile | 6 ++++++ | ||
14 | 2 files changed, 7 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk | ||
17 | index 06c276f..9c1eb51 100644 | ||
18 | --- a/nss/coreconf/arch.mk | ||
19 | +++ b/nss/coreconf/arch.mk | ||
20 | @@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) | ||
21 | ifeq ($(OS_TEST),i86pc) | ||
22 | OS_RELEASE := $(shell uname -r)_$(OS_TEST) | ||
23 | else | ||
24 | - OS_RELEASE := $(shell uname -r) | ||
25 | + OS_RELEASE ?= $(shell uname -r) | ||
26 | endif | ||
27 | |||
28 | # | ||
29 | diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile | ||
30 | index 0ce1425..ebeb411 100644 | ||
31 | --- a/nss/lib/freebl/Makefile | ||
32 | +++ b/nss/lib/freebl/Makefile | ||
33 | @@ -36,6 +36,12 @@ ifdef USE_64 | ||
34 | DEFINES += -DNSS_USE_64 | ||
35 | endif | ||
36 | |||
37 | +ifeq ($(OS_TEST),mips) | ||
38 | +ifndef USE_64 | ||
39 | + DEFINES += -DNS_PTR_LE_32 | ||
40 | +endif | ||
41 | +endif | ||
42 | + | ||
43 | ifdef USE_ABI32_FPU | ||
44 | DEFINES += -DNSS_USE_ABI32_FPU | ||
45 | endif | ||
46 | -- | ||
47 | 2.11.0 | ||
48 | |||
diff --git a/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch deleted file mode 100644 index f0b3550bff..0000000000 --- a/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
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 | |||