From 0f8bfbb25b62ce8c73f6c89ee6425f813ed77aab Mon Sep 17 00:00:00 2001
From: BoloniniD <denis@bolonin.ru>
Date: Thu, 17 Mar 2022 20:41:17 +0300
Subject: [PATCH] Add Rust aarch64 toolchain to Docker container

---
 contrib/BLAKE3                   |  2 +-
 docker/packager/deb/Dockerfile   | 14 ++++++++++++--
 src/Functions/FunctionsHashing.h |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/contrib/BLAKE3 b/contrib/BLAKE3
index 0009b91cfaa..74f7fa1652e 160000
--- a/contrib/BLAKE3
+++ b/contrib/BLAKE3
@@ -1 +1 @@
-Subproject commit 0009b91cfaa44171ce869d64037b20a2aef1525c
+Subproject commit 74f7fa1652e413fb7b86a86980cfff00a65fef7a
diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile
index a28fc5f1e38..94c65fe1baf 100644
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@@ -59,10 +59,20 @@ RUN apt-get update \
         pixz \
         pkg-config \
         tzdata \
-        rustc \
-        cargo \
         --yes --no-install-recommends
 
+# Rust toolchain
+RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+RUN rustup target add aarch64-unknown-linux-gnu && \
+    apt-get install \
+        gcc-aarch64-linux-gnu \
+        build-essential \
+        libc6 \
+        libc6-dev \
+        --yes
+
+
 # NOTE: Seems like gcc-11 is too new for ubuntu20 repository
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \
     && apt-get update \
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index 8fb01e06328..877ba82fa9c 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -599,7 +599,7 @@ struct ImplBLAKE3
     //static inline Hasher_shim blake3_hasher = new_hasher();
 
     static void apply(const char * begin, const size_t size, unsigned char* out_char_data)
-    {   
+    {
         #if defined(MEMORY_SANITIZER)
             auto err_msg = blake3_apply_shim_msan_compat(begin, size, out_char_data);
         #else