ci: Update dist-x86_64-netbsd to ubuntu:22.04

This commit is contained in:
Josh Stone 2023-07-20 17:15:02 -07:00
parent a82fa0d1c7
commit ecb84f65ea

View File

@ -1,14 +1,14 @@
FROM ubuntu:20.04
FROM ubuntu:22.04
ARG DEBIAN_FRONTEND=noninteractive
COPY scripts/cross-apt-packages.sh /scripts/
RUN sh /scripts/cross-apt-packages.sh
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y zlib1g-dev
RUN apt-get install -y zlib1g-dev
COPY host-x86_64/dist-x86_64-netbsd/build-netbsd-toolchain.sh /tmp/
RUN /tmp/build-netbsd-toolchain.sh
COPY scripts/cmake.sh /scripts/
RUN /scripts/cmake.sh
# GCC 10 changed the default to -fno-common, which causes errors with the NetBSD-9.0 sources like:
# /usr/bin/ld: buf.o:(.bss+0x0): multiple definition of `debug_file'; arch.o:(.bss+0x0): first defined here
RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh