Skip to content

Commit ecb84f6

Browse files
committed
ci: Update dist-x86_64-netbsd to ubuntu:22.04
1 parent a82fa0d commit ecb84f6

File tree

1 file changed

+6
-6
lines changed
  • src/ci/docker/host-x86_64/dist-x86_64-netbsd

1 file changed

+6
-6
lines changed

src/ci/docker/host-x86_64/dist-x86_64-netbsd/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
22

3+
ARG DEBIAN_FRONTEND=noninteractive
34
COPY scripts/cross-apt-packages.sh /scripts/
45
RUN sh /scripts/cross-apt-packages.sh
5-
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y zlib1g-dev
6+
RUN apt-get install -y zlib1g-dev
67

78
COPY host-x86_64/dist-x86_64-netbsd/build-netbsd-toolchain.sh /tmp/
8-
RUN /tmp/build-netbsd-toolchain.sh
9-
10-
COPY scripts/cmake.sh /scripts/
11-
RUN /scripts/cmake.sh
9+
# GCC 10 changed the default to -fno-common, which causes errors with the NetBSD-9.0 sources like:
10+
# /usr/bin/ld: buf.o:(.bss+0x0): multiple definition of `debug_file'; arch.o:(.bss+0x0): first defined here
11+
RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
1212

1313
COPY scripts/sccache.sh /scripts/
1414
RUN sh /scripts/sccache.sh

0 commit comments

Comments
 (0)