From 83b64f3049408ab758eda581414c8c402fb71b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 7 Jan 2025 15:49:19 +0200 Subject: [PATCH] docker: Install nasm instead of yasm This is one of the packages which aren't needed by the toolchain build itself, but is provided as a convenience to useres of the image. Many projects that build standalone x86 assembly can use either nasm or yasm, but lately most projects prefer nasm (which has support for newer x86 simd extensions). --- Dockerfile | 2 +- Dockerfile.dev | 2 +- Dockerfile.system-clang | 2 +- Dockerfile.toolchain | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2685396..c8b3ad3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update -qq && \ DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \ git wget bzip2 file unzip libtool pkg-config cmake build-essential \ - automake yasm gettext autopoint vim-tiny python3 \ + automake nasm gettext autopoint vim-tiny python3 \ ninja-build ca-certificates curl less zip && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.dev b/Dockerfile.dev index cbabe75..32e220c 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update -qq && \ DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \ git wget bzip2 file unzip libtool pkg-config cmake build-essential \ - automake yasm gettext autopoint vim-tiny python3 \ + automake nasm gettext autopoint vim-tiny python3 \ ninja-build ca-certificates curl less zip && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.system-clang b/Dockerfile.system-clang index 44e281a..267899e 100644 --- a/Dockerfile.system-clang +++ b/Dockerfile.system-clang @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update -qq && \ DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \ git wget bzip2 file unzip libtool pkg-config cmake build-essential \ - automake yasm gettext autopoint vim-tiny python3 \ + automake nasm gettext autopoint vim-tiny python3 \ ninja-build ca-certificates curl less zip && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.toolchain b/Dockerfile.toolchain index 3586023..b0ff655 100644 --- a/Dockerfile.toolchain +++ b/Dockerfile.toolchain @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update -qq && \ DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \ git wget bzip2 file unzip libtool pkg-config cmake build-essential \ - automake yasm gettext autopoint vim-tiny python3 \ + automake nasm gettext autopoint vim-tiny python3 \ ninja-build ca-certificates curl less zip && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/*