fix build errors

Author: garasubo

docker/Dockerfile.arm-unknown-linux-gnueabi

@@ -16,7 +16,7 @@ ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-gnueabi-
 ENV CROSS_SYSROOT=/usr/arm-linux-gnueabi
 
 COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=armel TARGET_TRIPLE=arm-linux-gnueabi /essential.sh
+RUN TARGET_ARCH=armel TARGET_TRIPLE=arm-linux-gnueabi /apt-cross-essential.sh
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=armel /deny-debian-packages.sh \

docker/Dockerfile.armv5te-unknown-linux-gnueabi

@@ -16,7 +16,7 @@ ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-gnueabi-
 ENV CROSS_SYSROOT=/usr/arm-linux-gnueabi
 
 COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=armel TARGET_TRIPLE=arm-linux-gnueabi /apt-cross-essential.sh
+RUN TARGET_ARCH=armel TARGET_TRIPLE=arm-linux-gnueabi CROSSBUILD_ESSENTIAL=1 /apt-cross-essential.sh
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=armel /deny-debian-packages.sh \

docker/Dockerfile.armv7-unknown-linux-gnueabihf

@@ -16,7 +16,7 @@ ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-gnueabihf-
 ENV CROSS_SYSROOT=/usr/arm-linux-gnueabihf
 
 COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=armhf TARGET_TRIPLE=arm-linux-gnueabihf /essential.sh
+RUN TARGET_ARCH=armhf TARGET_TRIPLE=arm-linux-gnueabihf /apt-cross-essential.sh
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=armhf /deny-debian-packages.sh \

docker/Dockerfile.sparc64-unknown-linux-gnu

@@ -18,11 +18,6 @@ ENV CROSS_SYSROOT=/usr/sparc64-linux-gnu
 COPY apt-cross-essential.sh /
 RUN TARGET_ARCH=sparc64 TARGET_TRIPLE=sparc64-linux-gnu /apt-cross-essential.sh
 
-RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
-    g++- \
-    gfortran-sparc64-linux-gnu \
-    libc6-dev-sparc64-cross
-
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=sparc64 /deny-debian-packages.sh \
     binutils \

docker/apt-cross-essential.sh

@@ -11,7 +11,12 @@ main() {
     local -a packages
 
     narch="$(dpkg --print-architecture)"
-    packages+=("libc6-dev-${TARGET_ARCH}-cross:${narch}" "crossbuild-essential-${TARGET_ARCH}:${narch}")
+    packages+=("libc6-dev-${TARGET_ARCH}-cross:${narch}")
+
+    # Install crossbuild-essential if CROSSBUILD_ESSENTIAL is set
+    if [ -n "${CROSSBUILD_ESSENTIAL:-}" ]; then
+        packages+=("crossbuild-essential-${TARGET_ARCH}:${narch}")
+    fi
 
     if ! command -v "${CROSS_TOOLCHAIN_PREFIX}g++" &>/dev/null; then
       packages+=("g++-${TARGET_TRIPLE}:${narch}")