diff options
Diffstat (limited to 'scripts/docker/mxe-build-container/Dockerfile-stage1')
| -rw-r--r-- | scripts/docker/mxe-build-container/Dockerfile-stage1 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/docker/mxe-build-container/Dockerfile-stage1 b/scripts/docker/mxe-build-container/Dockerfile-stage1 index 501bfe6ce..056e6fa8e 100644 --- a/scripts/docker/mxe-build-container/Dockerfile-stage1 +++ b/scripts/docker/mxe-build-container/Dockerfile-stage1 @@ -8,8 +8,8 @@ ARG mxe_sha=master ENV _ver=${mxe_sha} # update and set up the packages we need for this cross build -RUN apt-get update && apt-get upgrade -y -RUN apt-get install -y \ +RUN apt-get update && apt-get upgrade -y && \ +apt-get install -y \ autoconf \ automake \ autopoint \ @@ -17,6 +17,7 @@ RUN apt-get install -y \ binutils \ bison \ bzip2 \ + ca-certificates \ flex \ g++ \ g++-multilib \ @@ -28,6 +29,7 @@ RUN apt-get install -y \ libgdk-pixbuf2.0-dev \ libltdl-dev \ libssl-dev \ + libtool \ libtool-bin \ libxml-parser-perl \ make \ @@ -51,6 +53,10 @@ ADD settings-stage1.mk /win/settings.mk RUN cd /win ; git clone git://github.com/mxe/mxe ; \ cd mxe ; \ git checkout ${_ver} ; +# Patch the qtconnectivity build to explicilty enable native-win32-bluetooth and ensure another +# backend is not picked +ADD qtconnectivity-1.patch /win/qtconnectivity-1.patch +RUN mv /win/qtconnectivity-1.patch /win/mxe/src RUN mv /win/settings.mk /win/mxe RUN cd /win/mxe ; \ make -j 6 2>&1 | tee build.log ; |