From e4a1123e006a6f1651ad918ceaedbc72c63c45d1 Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Fri, 13 Sep 2024 01:36:41 +1200 Subject: [PATCH] CICD: Add libraw to the MXE build container. In support of #3954. Also update MXE to the latest version. Signed-off-by: Michael Keller --- .../mxe-build-container/build-container.sh | 18 ------------------ scripts/docker/mxe-build-container/settings.mk | 1 + 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100755 scripts/docker/mxe-build-container/build-container.sh diff --git a/scripts/docker/mxe-build-container/build-container.sh b/scripts/docker/mxe-build-container/build-container.sh deleted file mode 100755 index 617fcd1b06d..00000000000 --- a/scripts/docker/mxe-build-container/build-container.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -x -set -e - -# known good MXE sha -MXE_SHA="c0bfefc57a00fdf6cb5278263e21a478e47b0bf5" -SCRIPTPATH=$(dirname $0) - -# version of the docker image -VERSION=3.1.0 - -pushd $SCRIPTPATH - -# we use the 'experimental' --squash argument to significantly reduce the size of the massively huge -# Docker container this produces -docker build -t subsurface/mxe-build:$VERSION --build-arg=mxe_sha=$MXE_SHA -f Dockerfile . -docker images -popd diff --git a/scripts/docker/mxe-build-container/settings.mk b/scripts/docker/mxe-build-container/settings.mk index 995b3e4c0c5..f2cd288bd56 100644 --- a/scripts/docker/mxe-build-container/settings.mk +++ b/scripts/docker/mxe-build-container/settings.mk @@ -30,6 +30,7 @@ LOCAL_PKG_LIST := gcc \ libgit2 \ libftdi1 \ mdbtools \ + libraw \ qtconnectivity \ qtdeclarative \ qtimageformats \