diff mbox

nss: Fix build on mips/clang

Message ID 20160715100325.29006-1-raj.khem@gmail.com
State Accepted
Commit 119ff60101ed6fd542f1280d37a24411d8b14264
Headers show

Commit Message

Khem Raj July 15, 2016, 10:03 a.m. UTC
This issue is also reported here
https://trac.macports.org/ticket/51709
Patch is also from same ticket

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 .../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

-- 
2.9.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Khem Raj July 15, 2016, 2:36 p.m. UTC | #1
On Fri, Jul 15, 2016 at 7:34 AM, akuster808 <akuster808@gmail.com> wrote:
> Does this affect Krogoth?



yes


> - armin

>

> On 07/15/2016 03:03 AM, Khem Raj wrote:

>> This issue is also reported here

>> https://trac.macports.org/ticket/51709

>> Patch is also from same ticket

>>

>> Signed-off-by: Khem Raj <raj.khem@gmail.com>

>> ---

>>  .../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

>>

>> 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 0000000..9caaaeb

>> --- /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 <raj.khem@gmail.com>

>> +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 caed7fa..c7c9fab 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 \

>>  "

>>

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox

Patch

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 0000000..9caaaeb
--- /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 <raj.khem@gmail.com>
+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 caed7fa..c7c9fab 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 \
 "