diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-07-15 03:03:25 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:28:50 +0100 |
commit | 5813d4053ecd92e910cd9add4364ab63b2134dc5 (patch) | |
tree | 1ac44392e12d17cd22e640133049d7af519073ac /meta/recipes-support | |
parent | 05084640e6642acbdd4950a31d0879b482cb2701 (diff) | |
download | poky-5813d4053ecd92e910cd9add4364ab63b2134dc5.tar.gz |
nss: Fix build on mips/clang
This issue is also reported here
https://trac.macports.org/ticket/51709
Patch is also from same ticket
(From OE-Core rev: 119ff60101ed6fd542f1280d37a24411d8b14264)
Signed-off-by: Khem Raj <raj.khem@gmail.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')
-rw-r--r-- | meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 | ||||
-rw-r--r-- | meta/recipes-support/nss/nss_3.24.bb | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch new file mode 100644 index 0000000000..9caaaeb955 --- /dev/null +++ b/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | nss does not build on mips with clang because wrong types are used? | ||
2 | |||
3 | pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] | ||
4 | if (addend < MP_DIGIT_MAX) { | ||
5 | ~~~~~~ ^ ~~~~~~~~~~~~ | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | Upstream-Status: Pending | ||
9 | Index: nss-3.24/nss/lib/freebl/pqg.c | ||
10 | =================================================================== | ||
11 | --- nss-3.24.orig/nss/lib/freebl/pqg.c | ||
12 | +++ nss-3.24/nss/lib/freebl/pqg.c | ||
13 | @@ -322,8 +322,8 @@ generate_h_candidate(SECItem *hit, mp_in | ||
14 | |||
15 | static SECStatus | ||
16 | addToSeed(const SECItem * seed, | ||
17 | - unsigned long addend, | ||
18 | - int seedlen, /* g in 186-1 */ | ||
19 | + unsigned long long addend, | ||
20 | + int seedlen, /* g in 186-1 */ | ||
21 | SECItem * seedout) | ||
22 | { | ||
23 | mp_int s, sum, modulus, tmp; | ||
diff --git a/meta/recipes-support/nss/nss_3.24.bb b/meta/recipes-support/nss/nss_3.24.bb index caed7fa894..c7c9fab2af 100644 --- a/meta/recipes-support/nss/nss_3.24.bb +++ b/meta/recipes-support/nss/nss_3.24.bb | |||
@@ -21,6 +21,7 @@ SRC_URI = "\ | |||
21 | file://nss-fix-incorrect-shebang-of-perl.patch \ | 21 | file://nss-fix-incorrect-shebang-of-perl.patch \ |
22 | file://nss-fix-nsinstall-build.patch \ | 22 | file://nss-fix-nsinstall-build.patch \ |
23 | file://disable-Wvarargs-with-clang.patch \ | 23 | file://disable-Wvarargs-with-clang.patch \ |
24 | file://pqg.c-ULL_addend.patch \ | ||
24 | file://nss.pc.in \ | 25 | file://nss.pc.in \ |
25 | file://signlibs.sh \ | 26 | file://signlibs.sh \ |
26 | " | 27 | " |