Date: Mon, 29 Jan 2018 11:11:31 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460255 - head/security/nss/files Message-ID: <201801291111.w0TBBVRi070992@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Jan 29 11:11:31 2018 New Revision: 460255 URL: https://svnweb.freebsd.org/changeset/ports/460255 Log: security/nss: unbreak on aarch64 after r459458 PR: 225326 Submitted by: mikael.urankar@gmail.com Obtained from: upstream (NSS 3.36) MFH: 2018Q1 Added: head/security/nss/files/patch-bug1432455 (contents, props changed) Added: head/security/nss/files/patch-bug1432455 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/nss/files/patch-bug1432455 Mon Jan 29 11:11:31 2018 (r460255) @@ -0,0 +1,27 @@ +commit 1668fafc1db4 +Author: Daiki Ueno <dueno@redhat.com> +Date: Tue Jan 23 13:29:34 2018 +0100 + + Bug 1432455, Build Hacl_Poly1305_64.o on AArch64 even with make, r=fkiefer +--- + lib/freebl/Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git lib/freebl/Makefile lib/freebl/Makefile +index 0b3daa2756..6c8e6a2ead 100644 +--- lib/freebl/Makefile ++++ lib/freebl/Makefile +@@ -527,7 +527,12 @@ ifndef NSS_DISABLE_CHACHAPOLY + EXTRA_SRCS += chacha20_vec.c + endif + else +- EXTRA_SRCS += poly1305.c ++ ifeq ($(CPU_ARCH),aarch64) ++ EXTRA_SRCS += Hacl_Poly1305_64.c ++ else ++ EXTRA_SRCS += poly1305.c ++ endif ++ + EXTRA_SRCS += chacha20.c + VERIFIED_SRCS += Hacl_Chacha20.c + endif # x86_64
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801291111.w0TBBVRi070992>