diff options
| author | mrg <mrg@pkgsrc.org> | 2021-08-27 21:33:02 +0000 |
|---|---|---|
| committer | mrg <mrg@pkgsrc.org> | 2021-08-27 21:33:02 +0000 |
| commit | 1f83866613a7133abf166daaea82807f56916449 (patch) | |
| tree | 578d908cb5e7e2ccf19bb3442ab2c149df3059f9 | |
| parent | a960baa0024dcfd5ff0e46008646a2df390849ef (diff) | |
| download | pkgsrc-1f83866613a7133abf166daaea82807f56916449.tar.gz | |
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.)
| -rw-r--r-- | devel/nss/distinfo | 3 | ||||
| -rw-r--r-- | devel/nss/patches/patch-nss_lib_freebl_sha256-armv8.c | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/devel/nss/distinfo b/devel/nss/distinfo index fb38b81af2b..50cf19267e6 100644 --- a/devel/nss/distinfo +++ b/devel/nss/distinfo @@ -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_OpenBSD.mk) = 944f71fcaaa7d5b2b3ed008341b1392a65480f2b 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 --git a/devel/nss/patches/patch-nss_lib_freebl_sha256-armv8.c b/devel/nss/patches/patch-nss_lib_freebl_sha256-armv8.c new file mode 100644 index 00000000000..29a0fe43863 --- /dev/null +++ b/devel/nss/patches/patch-nss_lib_freebl_sha256-armv8.c @@ -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 */ |