From 8698aba49ea690f2a40f3121cdffcbe4f773c116 Mon Sep 17 00:00:00 2001 From: Uruk Date: Fri, 23 Feb 2024 18:36:32 +0100 Subject: Apply suggestions --- debian/docker/Dockerfile | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/debian/docker/Dockerfile b/debian/docker/Dockerfile index c93344d..f73a459 100644 --- a/debian/docker/Dockerfile +++ b/debian/docker/Dockerfile @@ -70,13 +70,35 @@ RUN if test "${PACKAGE_ARCH}" != "$( dpkg --print-architecture )"; then \ && cd cross-gcc-packages-amd64/cross-gcc-${GCC_VERSION}-${PACKAGE_ARCH} \ && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \ apt-get -f install --no-install-recommends -o Dpkg::Options::="--force-overwrite" -y \ - bison flex libtool gdb sharutils netbase libmpc-dev libmpfr-dev libgmp-dev \ - systemtap-sdt-dev autogen expect chrpath zlib1g-dev zip \ - binutils-aarch64-linux-gnu binutils-arm-linux-gnueabihf \ - gcc-${GCC_VERSION}-source libstdc++-${GCC_VERSION}-dev-${PACKAGE_ARCH}-cross \ - libc6-dev:${PACKAGE_ARCH} linux-libc-dev:${PACKAGE_ARCH} libgcc1:${PACKAGE_ARCH} libstdc++-${GCC_VERSION}-dev:${PACKAGE_ARCH} \ - libfontconfig*-dev:${PACKAGE_ARCH} libcurl*openssl-dev:${PACKAGE_ARCH} libfreetype*-dev:${PACKAGE_ARCH} libssl-dev:${PACKAGE_ARCH} \ - libssl[13].*:${PACKAGE_ARCH} liblttng-ust*:${PACKAGE_ARCH} \ + bison \ + flex \ + libtool \ + gdb \ + sharutils \ + netbase \ + libmpc-dev \ + libmpfr-dev \ + libgmp-dev \ + systemtap-sdt-dev \ + autogen \ + expect \ + chrpath \ + zlib1g-dev \ + zip \ + binutils-aarch64-linux-gnu \ + binutils-arm-linux-gnueabihf \ + gcc-${GCC_VERSION}-source \ + libstdc++-${GCC_VERSION}-dev-${PACKAGE_ARCH}-cross \ + libc6-dev:${PACKAGE_ARCH} \ + linux-libc-dev:${PACKAGE_ARCH} \ + libgcc1:${PACKAGE_ARCH} \ + libstdc++-${GCC_VERSION}-dev:${PACKAGE_ARCH} \ + libfontconfig*-dev:${PACKAGE_ARCH} \ + libcurl*openssl-dev:${PACKAGE_ARCH} \ + libfreetype*-dev:${PACKAGE_ARCH} \ + libssl-dev:${PACKAGE_ARCH} \ + libssl[13].*:${PACKAGE_ARCH} \ + liblttng-ust*:${PACKAGE_ARCH} \ && apt-get clean autoclean -y \ && apt-get autoremove -y \ && rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/* -- cgit