From 5813d4053ecd92e910cd9add4364ab63b2134dc5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Jul 2016 03:03:25 -0700 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 ++++++++++++++++++++++ meta/recipes-support/nss/nss_3.24.bb | 1 + 2 files changed, 24 insertions(+) create mode 100644 meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch (limited to 'meta') 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 @@ +nss does not build on mips with clang because wrong types are used? + +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] + if (addend < MP_DIGIT_MAX) { + ~~~~~~ ^ ~~~~~~~~~~~~ + +Signed-off-by: Khem Raj +Upstream-Status: Pending +Index: nss-3.24/nss/lib/freebl/pqg.c +=================================================================== +--- nss-3.24.orig/nss/lib/freebl/pqg.c ++++ nss-3.24/nss/lib/freebl/pqg.c +@@ -322,8 +322,8 @@ generate_h_candidate(SECItem *hit, mp_in + + static SECStatus + addToSeed(const SECItem * seed, +- unsigned long addend, +- int seedlen, /* g in 186-1 */ ++ unsigned long long addend, ++ int seedlen, /* g in 186-1 */ + SECItem * seedout) + { + 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 = "\ file://nss-fix-incorrect-shebang-of-perl.patch \ file://nss-fix-nsinstall-build.patch \ file://disable-Wvarargs-with-clang.patch \ + file://pqg.c-ULL_addend.patch \ file://nss.pc.in \ file://signlibs.sh \ " -- cgit 1.2.3-korg