From a1ad0ca88d2f4eb5e31d5eec91a982a6e4f58f19 Mon Sep 17 00:00:00 2001
From: BoloniniD <denis@bolonin.ru>
Date: Wed, 30 Mar 2022 14:31:28 +0300
Subject: [PATCH] Add sysroot for special target - test

---
 contrib/BLAKE3                    | 2 +-
 docker/packager/binary/Dockerfile | 4 ----
 docker/packager/binary/build.sh   | 2 +-
 docker/packager/deb/Dockerfile    | 3 ---
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/contrib/BLAKE3 b/contrib/BLAKE3
index e98f5cfc4b8..6bd2f2c2f67 160000
--- a/contrib/BLAKE3
+++ b/contrib/BLAKE3
@@ -1 +1 @@
-Subproject commit e98f5cfc4b81fb74723c36ae12b8e7b0766855e3
+Subproject commit 6bd2f2c2f67a349b790b2290303c1432b92b6462
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 4caa45210a9..67bdc88478f 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -50,7 +50,6 @@ RUN apt-get update \
         pigz \
         rename \
         software-properties-common \
-        gcc-multilib \
         --yes --no-install-recommends \
     && apt-get clean
 
@@ -63,10 +62,7 @@ RUN rustup target add aarch64-unknown-linux-gnu && \
         rustup target add aarch64-apple-darwin && \
         rustup target add powerpc64le-unknown-linux-gnu
 RUN apt-get install \
-        gcc-aarch64-linux-gnu \
         build-essential \
-        libc6 \
-        libc6-dev \
         --yes
 
 # This symlink required by gcc to find lld compiler
diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh
index 31416e1a0ee..44597265974 100755
--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary/build.sh
@@ -23,7 +23,7 @@ rm -f CMakeCache.txt
 # Read cmake arguments into array (possibly empty)
 read -ra CMAKE_FLAGS <<< "${CMAKE_FLAGS:-}"
 env
-cmake --debug-trycompile --verbose=1 -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" ..
+cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" ..
 
 cache_status
 # clear cache stats
diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile
index 94c65fe1baf..022e33d23af 100644
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@@ -66,10 +66,7 @@ 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