From cd86c34b904ceb6911d88156c0339af8bc9ccbe6 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Fri, 7 Jan 2022 21:57:42 +1100 Subject: [PATCH] Add musl headers for multi-lang --- .github/workflows/push.yml | 2 +- Dockerfile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index b77f4187..116f570a 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -53,7 +53,7 @@ jobs: steps: - name: Install dependencies (apk) - run: apk add --no-cache gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git bash + run: apk add --no-cache gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git bash musl-dev - name: Install dependencies (python) run: python3 -m pip install bdflib diff --git a/Dockerfile b/Dockerfile index d183f776..5071dbfa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,10 @@ WORKDIR /build # Compilders ->gcc-* newlib-* # Python3 -> py* # Misc -> findutils make git +# musl-dev is required for the multi lang firmwares +# clang is required for clang-format (for dev) -RUN apk add --no-cache gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git +RUN apk add --no-cache gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git musl-dev clang # Install Python3 packages