mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

update MXE build container

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2023-12-06 04:27:13 -08:00
parent 2463b315bb
commit 9cfe656342
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/docker/mxe-build-container/Dockerfile
View file

@ -3,7 +3,7 @@
#
# Start from Ubuntu
From ubuntu:20.04
From ubuntu:22.04
# very often master is broken, so we pass in a known good SHA
ARG mxe_sha=master
@ -40,7 +40,8 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
patch \
perl \
pkg-config \
python \
python3 \
python3-mako \
ruby \
sed \
unzip \
@ -62,6 +63,7 @@ ADD qtconnectivity-1.patch /win/mxe/src/qtconnectivity-1.patch
# Move the settings into place to build everything that we need
# separate download from build so that we can redo the build
ADD settings.mk /win/mxe/settings.mk
RUN [ -f /usr/bin/python ] || ln -s /usr/bin/python3 /usr/bin/python
RUN cd /win/mxe ; \
make -j 6 download 2>&1 | tee mxe-build.log
RUN cd /win/mxe ; \