|
1 | | -FROM ubuntu:20.04 |
| 1 | +FROM ubuntu:22.04 |
2 | 2 |
|
3 | | -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ |
| 3 | +ARG DEBIAN_FRONTEND=noninteractive |
| 4 | +RUN apt-get update && apt-get install -y --no-install-recommends \ |
4 | 5 | g++ \ |
5 | 6 | automake \ |
6 | 7 | bison \ |
@@ -73,8 +74,8 @@ RUN env \ |
73 | 74 | CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv6 -marm -mfpu=vfp" \ |
74 | 75 | bash musl.sh armhf && \ |
75 | 76 | env \ |
76 | | - CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv7-a" \ |
77 | | - CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv7-a" \ |
| 77 | + CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv7-a -mfpu=vfp3" \ |
| 78 | + CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv7-a -mfpu=vfp3" \ |
78 | 79 | bash musl.sh armv7hf && \ |
79 | 80 | env \ |
80 | 81 | CC=mips-openwrt-linux-gcc \ |
@@ -147,7 +148,7 @@ ENV TARGETS=$TARGETS,armv7a-none-eabi |
147 | 148 | ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft" \ |
148 | 149 | CFLAGS_arm_unknown_linux_musleabi="-march=armv6 -marm" \ |
149 | 150 | CFLAGS_arm_unknown_linux_musleabihf="-march=armv6 -marm -mfpu=vfp" \ |
150 | | - CFLAGS_armv7_unknown_linux_musleabihf="-march=armv7-a" \ |
| 151 | + CFLAGS_armv7_unknown_linux_musleabihf="-march=armv7-a -mfpu=vfp3" \ |
151 | 152 | CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \ |
152 | 153 | CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \ |
153 | 154 | CC_mips64el_unknown_linux_muslabi64=mips64el-linux-gnuabi64-gcc \ |
@@ -186,9 +187,6 @@ ENV SCRIPT \ |
186 | 187 | python3 ../x.py --stage 2 test --host='' --target $RUN_MAKE_TARGETS tests/run-make && \ |
187 | 188 | python3 ../x.py dist --host='' --target $TARGETS |
188 | 189 |
|
189 | | -COPY scripts/cmake.sh /scripts/ |
190 | | -RUN /scripts/cmake.sh |
191 | | - |
192 | 190 | # sccache |
193 | 191 | COPY scripts/sccache.sh /scripts/ |
194 | 192 | RUN sh /scripts/sccache.sh |
0 commit comments