external/argon2/UnpackedTarball_argon2.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4c2243cd597cb323e31e42ed7d51e65edca7e03d
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Jan 4 21:16:47 2024 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Jan 5 10:59:09 2024 +0100
argon2: build opt.c again for WNT X86_64
Commit 401e9408d14dc2b9d07183a04c223831a59f71a3 replaced opt.c with
ref.c also for X86_64, which was probably not intended; apply patch only
when needed.
Change-Id: Ie7ca7b88751fb2d7de4d1a27e81c7f60a98359f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161629
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/external/argon2/UnpackedTarball_argon2.mk
b/external/argon2/UnpackedTarball_argon2.mk
index 3addfad639d5..a91d3d6651c4 100644
--- a/external/argon2/UnpackedTarball_argon2.mk
+++ b/external/argon2/UnpackedTarball_argon2.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,argon2,1))
$(eval $(call gb_UnpackedTarball_add_patches,argon2,\
external/argon2/0001-Fix-possible-compiler-error-due-to-undefined-_MSC_VE.patch
\
- external/argon2/0002-Add-WinARM64-vcxproj-config.patch \
+ $(if $(filter
WNT_AARCH64,$(OS)_$(CPUNAME)),external/argon2/0002-Add-WinARM64-vcxproj-config.patch)
\
))
# vim: set noet sw=4 ts=4:
