diff --git a/mozilla-nss.changes b/mozilla-nss.changes index 824e969..a4d8137 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 31 09:31:14 UTC 2020 - Martin Sirringhaus + +- Add patch nss-kremlin-ppc64le.patch to fix ppc and s390x builds + ------------------------------------------------------------------- Mon Mar 30 13:35:25 UTC 2020 - Wolfgang Rosenauer diff --git a/mozilla-nss.spec b/mozilla-nss.spec index 0e1e9a9..440f42d 100644 --- a/mozilla-nss.spec +++ b/mozilla-nss.spec @@ -49,6 +49,7 @@ Patch4: add-relro-linker-option.patch Patch5: malloc.patch Patch6: bmo-1400603.patch Patch7: nss-sqlitename.patch +Patch8: nss-kremlin-ppc64le.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: pkgconfig(nspr) >= %{NSPR_min_version} @@ -179,6 +180,7 @@ cd nss %endif %patch6 -p1 %patch7 -p1 +%patch8 -p1 # additional CA certificates #cd security/nss/lib/ckfw/builtins #cat %{SOURCE2} >> certdata.txt diff --git a/nss-kremlin-ppc64le.patch b/nss-kremlin-ppc64le.patch new file mode 100644 index 0000000..a5fd523 --- /dev/null +++ b/nss-kremlin-ppc64le.patch @@ -0,0 +1,30 @@ +Index: nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h +=================================================================== +--- nss.orig/lib/freebl/verified/kremlin/include/kremlin/internal/types.h ++++ nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h +@@ -56,7 +56,9 @@ typedef const char *Prims_string; + #include + typedef __m128i FStar_UInt128_uint128; + #elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ +- (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__)) ++ (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ ++ (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \ ++ defined(__s390x__)) + typedef unsigned __int128 FStar_UInt128_uint128; + #else + typedef struct FStar_UInt128_uint128_s { +Index: nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h +=================================================================== +--- nss.orig/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h ++++ nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h +@@ -25,7 +25,9 @@ + #include "LowStar_Endianness.h" + + #if !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ +- (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__)) ++ (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ ++ (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \ ++ defined(__s390x__)) + + /* GCC + using native unsigned __int128 support */ +