commit dc9064a43495c03ca4aa9188848a082905a430bb
Author: Jan Palus <[email protected]>
Date: Wed Jun 14 22:46:23 2023 +0200
up to 3.90
- upstream fix for build failure on 64-bit archs other than x86_64
non-x86-64b-archs.patch | 35 +++++++++++++++++++++++++++++++++++
nss.spec | 8 ++++++--
2 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/nss.spec b/nss.spec
index 3953e01..9eb41e8 100644
--- a/nss.spec
+++ b/nss.spec
@@ -7,19 +7,20 @@
Summary: NSS - Network Security Services
Summary(pl.UTF-8): NSS - Network Security Services
Name: nss
-Version: 3.89.1
+Version: 3.90
Release: 1
Epoch: 1
License: MPL v2.0
Group: Libraries
Source0:
https://ftp.mozilla.org/pub/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5: c7e06669859cd27af7405ce6ab62cbfb
+# Source0-md5: d83c24d03fb4f9a7f688b5d7c6938972
Source1: %{name}-mozilla-nss.pc
Source2: %{name}-config.in
Source3: https://www.cacert.org/certs/root.der
# Source3-md5: a61b375e390d9c3654eebd2031461f6b
Source4: nss-softokn.pc.in
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1083900
+Patch0: non-x86-64b-archs.patch
URL: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
BuildRequires: nspr-devel >= %{nspr_ver}
%{!?with_bootstrap:BuildRequires: nss-tools}
@@ -107,6 +108,9 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
%prep
%setup -q
+cd nss
+%patch0 -p1
+cd ..
# http://pki.fedoraproject.org/wiki/ECC_Capable_NSS
for dir in ecc noecc; do
diff --git a/non-x86-64b-archs.patch b/non-x86-64b-archs.patch
new file mode 100644
index 0000000..e576930
--- /dev/null
+++ b/non-x86-64b-archs.patch
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Natalia Kulatova <[email protected]>
+# Date 1685981398 0
+# Node ID 52a5d8fe37410d940e7d3ca244146ebc46a7d52a
+# Parent 52969cff7db635e0ee10fad66eed2c0cfdcf999b
+Bug 1836781 - Disabling ASM C25519 for A but X86_64 r=bbeurdouche,nss-reviewers
+
+Differential Revision: https://phabricator.services.mozilla.com/D179969
+
+diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
+--- a/lib/freebl/Makefile
++++ b/lib/freebl/Makefile
+@@ -563,17 +563,19 @@ endif # target == SunO
+ ifdef USE_64
+ # no __int128 at least up to lcc 1.23 (pretending to be gcc5)
+ # NB: CC_NAME is not defined here
+ ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc)
+ ifdef CC_IS_CLANG
+ HAVE_INT128_SUPPORT = 1
+ DEFINES += -DHAVE_INT128_SUPPORT
+ else ifeq (1,$(CC_IS_GCC))
+- SUPPORTS_VALE_CURVE25519 = 1
++ ifeq ($(CPU_ARCH),x86_64)
++ SUPPORTS_VALE_CURVE25519 = 1
++ endif
+ ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word
2,$(GCC_VERSION))))
+ HAVE_INT128_SUPPORT = 1
+ DEFINES += -DHAVE_INT128_SUPPORT
+ endif
+ ifneq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION))))
+ NSS_DISABLE_AVX2 = 1
+ endif
+ ifeq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION))))
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nss.git/commitdiff/dc9064a43495c03ca4aa9188848a082905a430bb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
