pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/nss fix build on arm64eb: sha512.c and sha256-ar...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a396c6ff271f
branches:  trunk
changeset: 457507:a396c6ff271f
user:      mrg <mrg%pkgsrc.org@localhost>
date:      Fri Aug 27 21:33:02 2021 +0000

description:
fix build on arm64eb: sha512.c and sha256-armv8.c both provided the
same symbols.  (sha256-x86.c has the same problem, but that file
already requires little endian so is not a big deal.)

diffstat:

 devel/nss/distinfo                                    |   3 ++-
 devel/nss/patches/patch-nss_lib_freebl_sha256-armv8.c |  17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r ae9cfd8b99f0 -r a396c6ff271f devel/nss/distinfo
--- a/devel/nss/distinfo        Fri Aug 27 17:46:45 2021 +0000
+++ b/devel/nss/distinfo        Fri Aug 27 21:33:02 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.134 2021/08/09 07:54:47 wiz Exp $
+$NetBSD: distinfo,v 1.135 2021/08/27 21:33:02 mrg Exp $
 
 SHA1 (nss-3.69.tar.gz) = e3c99a69ecf1073c473ce52a8b1532c56357c2b1
 RMD160 (nss-3.69.tar.gz) = 45db84366dcf41ea40b44ece97954a767f962963
@@ -14,6 +14,7 @@
 SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74
 SHA1 (patch-nss_lib_freebl_aes-armv8.c) = aa698f61dd3d66ba707a9b5425bc15d057244ad7
 SHA1 (patch-nss_lib_freebl_gcm-aarch64.c) = 311cfe7ca58e91285052d0ca27bd2df3f325071b
+SHA1 (patch-nss_lib_freebl_sha256-armv8.c) = caf26a0cbe47a54ded4751d0258d7be34d1d9f29
 SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb
 SHA1 (patch-nss_tests_all.sh) = b328778b538db66f5447f962f23afd6f650f7071
 SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7
diff -r ae9cfd8b99f0 -r a396c6ff271f devel/nss/patches/patch-nss_lib_freebl_sha256-armv8.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nss/patches/patch-nss_lib_freebl_sha256-armv8.c     Fri Aug 27 21:33:02 2021 +0000
@@ -0,0 +1,17 @@
+--- nss/lib/freebl/sha256-armv8.c.orig 2021-08-05 01:03:36.000000000 -0700
++++ nss/lib/freebl/sha256-armv8.c      2021-08-27 14:21:56.160037512 -0700
+@@ -2,7 +2,7 @@
+  * License, v. 2.0. If a copy of the MPL was not distributed with this
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+-#ifdef USE_HW_SHA2
++#if defined(USE_HW_SHA2) && defined(IS_LITTLE_ENDIAN)
+ 
+ #ifndef __ARM_FEATURE_CRYPTO
+ #error "Compiler option is invalid"
+@@ -200,4 +200,4 @@ SHA256_Update_Native(SHA256Context *ctx,
+     }
+ }
+ 
+-#endif /* USE_HW_SHA2 */
++#endif /* USE_HW_SHA2 && IS_LITTLE_ENDIAN */



Home | Main Index | Thread Index | Old Index