mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +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
Show stats 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 # Start from Ubuntu
From ubuntu:20.04 From ubuntu:22.04
# very often master is broken, so we pass in a known good SHA # very often master is broken, so we pass in a known good SHA
ARG mxe_sha=master ARG mxe_sha=master
@ -40,7 +40,8 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
patch \ patch \
perl \ perl \
pkg-config \ pkg-config \
python \ python3 \
python3-mako \
ruby \ ruby \
sed \ sed \
unzip \ 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 # Move the settings into place to build everything that we need
# separate download from build so that we can redo the build # separate download from build so that we can redo the build
ADD settings.mk /win/mxe/settings.mk ADD settings.mk /win/mxe/settings.mk
RUN [ -f /usr/bin/python ] || ln -s /usr/bin/python3 /usr/bin/python
RUN cd /win/mxe ; \ RUN cd /win/mxe ; \
make -j 6 download 2>&1 | tee mxe-build.log make -j 6 download 2>&1 | tee mxe-build.log
RUN cd /win/mxe ; \ RUN cd /win/mxe ; \

4
scripts/docker/mxe-build-container/build-container.sh
View file

@ -3,11 +3,11 @@ set -x
set -e set -e
# known good MXE sha # known good MXE sha
MXE_SHA="8966a64" MXE_SHA="0d21cf2e31d4e6c0"
SCRIPTPATH=$(dirname $0) SCRIPTPATH=$(dirname $0)
# version of the docker image # version of the docker image
VERSION=2.1 VERSION=3.0
pushd $SCRIPTPATH pushd $SCRIPTPATH

2
scripts/docker/mxe-build-container/settings.mk
View file

@ -8,7 +8,7 @@ JOBS := 8
# This variable controls the targets that will build. # This variable controls the targets that will build.
MXE_TARGETS := x86_64-w64-mingw32.shared i686-w64-mingw32.shared MXE_TARGETS := x86_64-w64-mingw32.shared i686-w64-mingw32.shared
MXE_PLUGIN_DIRS := plugins/gcc10 # MXE_PLUGIN_DIRS := plugins/gcc10
# The three lines below makes `make` build these "local packages" instead of all packages. # The three lines below makes `make` build these "local packages" instead of all packages.
# The ordering of the list appears weird, but this seems to help to get the build done # The ordering of the list appears weird, but this seems to help to get the build done