commit e136c96beaa7e386b59c74b5420c88df69664c67
Author: Jan Rękorajski <[email protected]>
Date: Fri Feb 27 22:34:30 2015 +0100
- fix building on x32
- rel 3
nss.spec | 4 +++-
x32.patch | 27 +++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
---
diff --git a/nss.spec b/nss.spec
index 61bddb3..2a524b0 100644
--- a/nss.spec
+++ b/nss.spec
@@ -4,7 +4,7 @@ Summary: NSS - Network Security Services
Summary(pl.UTF-8): NSS - Network Security Services
Name: nss
Version: 3.17.4
-Release: 2
+Release: 3
Epoch: 1
License: MPL v2.0
Group: Libraries
@@ -17,6 +17,7 @@ Source3: http://www.cacert.org/certs/root.der
Source4: nss-softokn.pc.in
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1083900
Patch0: tls12.patch
+Patch1: x32.patch
URL: http://www.mozilla.org/projects/security/pki/nss/
BuildRequires: nspr-devel >= %{nspr_ver}
BuildRequires: nss-tools
@@ -100,6 +101,7 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
cd nss
%patch0 -p1
cd ..
+%patch1 -p1
%if 0%{!?debug:1}
# strip before signing
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..2f0ef7b
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,27 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=966596
+
+--- nss-3.15/nss/lib/freebl/Makefile
++++ nss-3.15/nss/lib/freebl/Makefile
+@@ -193,12 +193,16 @@
+ MPI_SRCS += mpi_amd64.c mp_comba.c
+ endif
+ ifeq ($(CPU_ARCH),x86)
+- ASFILES = mpi_x86.s
+- DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
+- DEFINES += -DMP_ASSEMBLY_DIV_2DX1D -DMP_USE_UINT_DIGIT
+- DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
+- # The floating point ECC code doesn't work on Linux x86 (bug 311432).
+- #ECL_USE_FP = 1
++ ifeq ($(USE_X32),1)
++ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
++ else
++ ASFILES = mpi_x86.s
++ DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
++ DEFINES += -DMP_ASSEMBLY_DIV_2DX1D -DMP_USE_UINT_DIGIT
++ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
++ # The floating point ECC code doesn't work on Linux x86 (bug 311432).
++ #ECL_USE_FP = 1
++ endif
+ endif
+ ifeq ($(CPU_ARCH),arm)
+ DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nss.git/commitdiff/e136c96beaa7e386b59c74b5420c88df69664c67
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
