diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2026-09-02 05:11:39 +0000 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2026-09-02 05:12:00 +0000 |
| commit | 3ea9475a58b2f0906cd52fc4ced038f6e8086315 (patch) | |
| tree | 38e024a462e0f18662451dd34030050e2998a28e | |
| parent | 742e58ff7fec5f23d772b47fa0712a510cfcbc5d (diff) | |
security/veracrypt: Fix build on aarch64
3 files changed, 16 insertions, 8 deletions
diff --git a/security/veracrypt/files/patch-src_Build_Include_Makefile.inc b/security/veracrypt/files/patch-src_Build_Include_Makefile.inc index bb70cc0b38ff..a8730f525d6f 100644 --- a/security/veracrypt/files/patch-src_Build_Include_Makefile.inc +++ b/security/veracrypt/files/patch-src_Build_Include_Makefile.inc @@ -1,6 +1,6 @@ ---- src/Build/Include/Makefile.inc 2025-06-07 16:38:57.314038000 -0700 -+++ src/Build/Include/Makefile.inc 2025-06-07 16:41:54.192457000 -0700 -@@ -26,19 +26,35 @@ +--- src/Build/Include/Makefile.inc.orig 2026-06-09 10:55:00 UTC ++++ src/Build/Include/Makefile.inc +@@ -26,23 +26,43 @@ clean: %.osse41: %.c @echo Compiling $(<F) @@ -34,5 +34,13 @@ $(CC) $(CFLAGS) -mssse3 -c $< -o $@ +endif + %.oavx2: %.c + @echo Compiling $(<F) ++ifeq "$(PLATFORM_ARCH)" "arm64" ++ $(CC) $(CFLAGS) -c $< -o $@ ++else + $(CC) $(CFLAGS) -mavx2 -c $< -o $@ ++endif + %.oarmv8crypto: %.c @echo Compiling $(<F) diff --git a/security/veracrypt/files/patch-src_Main_TextUserInterface.cpp b/security/veracrypt/files/patch-src_Main_TextUserInterface.cpp index f82c1140b6db..2a548dfb60e0 100644 --- a/security/veracrypt/files/patch-src_Main_TextUserInterface.cpp +++ b/security/veracrypt/files/patch-src_Main_TextUserInterface.cpp @@ -2,9 +2,9 @@ TextUserInterface.cpp:122:5: error: const_cast from 'const wxScopedWCharBuffer' const_cast <wchar_t *> (passwordStr.wc_str())[i] = L'X'; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ---- src/Main/TextUserInterface.cpp.orig 2017-07-09 22:31:19 UTC +--- src/Main/TextUserInterface.cpp.orig 2026-06-09 10:55:00 UTC +++ src/Main/TextUserInterface.cpp -@@ -119,7 +119,7 @@ namespace VeraCrypt +@@ -172,7 +172,7 @@ namespace VeraCrypt for (size_t i = 0; i < length && i < VolumePassword::MaxSize; ++i) { passwordBuf[i] = (wchar_t) passwordStr[i]; diff --git a/security/veracrypt/files/patch-src_Makefile b/security/veracrypt/files/patch-src_Makefile index ffdd96056e5e..57739ca4c1b1 100644 --- a/security/veracrypt/files/patch-src_Makefile +++ b/security/veracrypt/files/patch-src_Makefile @@ -1,6 +1,6 @@ ---- src/Makefile.orig 2026-06-09 03:55:00.000000000 -0700 -+++ src/Makefile 2026-06-17 12:20:53.693603000 -0700 -@@ -47,10 +47,10 @@ +--- src/Makefile.orig 2026-06-09 10:55:00 UTC ++++ src/Makefile +@@ -47,10 +47,10 @@ export CFLAGS := -Wall export RANLIB ?= ranlib export CFLAGS := -Wall |