Add meson and ninja to all build containers

Includes cross compilation config for ARM

Author: lovell

linux-arm64v8/Dockerfile

@@ -9,15 +9,18 @@ RUN \
   apt-get install -y curl && \
   dpkg --add-architecture arm64 && \
   apt-get update && \
-  apt-get install -y crossbuild-essential-arm64 autoconf libtool nasm gtk-doc-tools texinfo gperf advancecomp libglib2.0-dev jq gettext intltool autopoint cmake && \
+  apt-get install -y crossbuild-essential-arm64 autoconf libtool nasm gtk-doc-tools texinfo gperf advancecomp libglib2.0-dev jq gettext intltool autopoint cmake python3-pip ninja-build && \
   curl https://sh.rustup.rs -sSf | sh -s -- -y && \
-  ~/.cargo/bin/rustup target add aarch64-unknown-linux-gnu
+  ~/.cargo/bin/rustup target add aarch64-unknown-linux-gnu && \
+  pip3 install meson
 
 # Compiler settings
 ENV \
   PATH="/root/.cargo/bin:$PATH" \
   PLATFORM="linux-arm64v8" \
   CHOST="aarch64-linux-gnu" \
-  FLAGS="-march=armv8-a -Os -D_GLIBCXX_USE_CXX11_ABI=0"
+  FLAGS="-march=armv8-a -Os -D_GLIBCXX_USE_CXX11_ABI=0" \
+  MESON="--cross-file=/root/meson.ini"
 
 COPY Toolchain.cmake /root/
+COPY meson.ini /root/

linux-arm64v8/meson.ini

@@ -0,0 +1,15 @@
+[host_machine]
+system = 'linux'
+cpu_family = 'aarch64'
+cpu = 'armv8-a'
+endian = 'little'
+
+[binaries]
+c = '/usr/bin/aarch64-linux-gnu-gcc'
+cpp = '/usr/bin/aarch64-linux-gnu-g++'
+ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'
+nm = '/usr/bin/aarch64-linux-gnu-gcc-nm'
+ld = '/usr/bin/aarch64-linux-gnu-gcc-ld'
+strip = '/usr/bin/aarch64-linux-gnu-strip'
+pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'
+ranlib = '/usr/bin/aarch64-linux-gnu-gcc-ranlib'

linux-armv6/Dockerfile

@@ -9,18 +9,21 @@ RUN \
   apt-get install -y curl && \
   dpkg --add-architecture armhf && \
   apt-get update && \
-  apt-get install -y autoconf libtool nasm gtk-doc-tools texinfo gperf advancecomp libglib2.0-dev jq gettext intltool autopoint cmake && \
+  apt-get install -y autoconf libtool nasm gtk-doc-tools texinfo gperf advancecomp libglib2.0-dev jq gettext intltool autopoint cmake python3-pip ninja-build && \
   mkdir /root/tools && \
   curl -Ls https://github.com/rvagg/rpi-newer-crosstools/archive/master.tar.gz | tar xzC /root/tools --strip-components=1 && \
   curl https://sh.rustup.rs -sSf | sh -s -- -y && \
-  ~/.cargo/bin/rustup target add arm-unknown-linux-gnueabihf
+  ~/.cargo/bin/rustup target add arm-unknown-linux-gnueabihf && \
+  pip3 install meson
 
 # Compiler settings
 ENV \
   PATH="/root/.cargo/bin:/root/tools/x64-gcc-6.5.0/arm-rpi-linux-gnueabihf/bin:$PATH" \
   PLATFORM="linux-armv6" \
   CHOST="arm-rpi-linux-gnueabihf" \
   RUST_TARGET="arm-unknown-linux-gnueabihf" \
-  FLAGS="-marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -Os -D_GLIBCXX_USE_CXX11_ABI=0"
+  FLAGS="-marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -Os -D_GLIBCXX_USE_CXX11_ABI=0" \
+  MESON="--cross-file=/root/meson.ini"
 
 COPY Toolchain.cmake /root/
+COPY meson.ini /root/

linux-armv6/meson.ini

@@ -0,0 +1,15 @@
+[host_machine]
+system = 'linux'
+cpu_family = 'arm'
+cpu = 'armv6-a'
+endian = 'little'
+
+[binaries]
+c = '/root/tools/x64-gcc-6.5.0/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc'
+cpp = '/root/tools/x64-gcc-6.5.0/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++'
+ar = '/root/tools/x64-gcc-6.5.0/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-ar'
+nm = '/root/tools/x64-gcc-6.5.0/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc-nm'
+ld = '/root/tools/x64-gcc-6.5.0/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc-ld'
+strip = '/root/tools/x64-gcc-6.5.0/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-strip'
+pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+ranlib = '/root/tools/x64-gcc-6.5.0/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc-ranlib'

linux-armv7/Dockerfile

@@ -9,15 +9,18 @@ RUN \
   apt-get install -y curl && \
   dpkg --add-architecture armhf && \
   apt-get update && \
-  apt-get install -y crossbuild-essential-armhf autoconf libtool nasm gtk-doc-tools texinfo gperf advancecomp libglib2.0-dev jq gettext intltool autopoint cmake && \
+  apt-get install -y crossbuild-essential-armhf autoconf libtool nasm gtk-doc-tools texinfo gperf advancecomp libglib2.0-dev jq gettext intltool autopoint cmake python3-pip ninja-build && \
   curl https://sh.rustup.rs -sSf | sh -s -- -y && \
-  ~/.cargo/bin/rustup target add arm-unknown-linux-gnueabihf
+  ~/.cargo/bin/rustup target add arm-unknown-linux-gnueabihf && \
+  pip3 install meson
 
 # Compiler settings
 ENV \
   PATH="/root/.cargo/bin:$PATH" \
   PLATFORM="linux-armv7" \
   CHOST="arm-linux-gnueabihf" \
-  FLAGS="-marm -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard -Os -D_GLIBCXX_USE_CXX11_ABI=0"
+  FLAGS="-marm -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard -Os -D_GLIBCXX_USE_CXX11_ABI=0" \
+  MESON="--cross-file=/root/meson.ini"
 
 COPY Toolchain.cmake /root/
+COPY meson.ini /root/

linux-armv7/meson.ini

@@ -0,0 +1,15 @@
+[host_machine]
+system = 'linux'
+cpu_family = 'arm'
+cpu = 'armv7-a'
+endian = 'little'
+
+[binaries]
+c = '/usr/bin/arm-linux-gnueabihf-gcc'
+cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'
+nm = '/usr/bin/arm-linux-gnueabihf-gcc-nm'
+ld = '/usr/bin/arm-linux-gnueabihf-gcc-ld'
+strip = '/usr/bin/arm-linux-gnueabihf-strip'
+pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+ranlib = '/usr/bin/arm-linux-gnueabihf-gcc-ranlib'

linux-x64/Dockerfile

@@ -5,10 +5,10 @@ MAINTAINER Lovell Fuller <[email protected]>
 
 # Build dependencies
 RUN \
-  yum update -y \
-  && yum install -y epel-release centos-release-scl \
-  && yum group install -y "Development Tools" \
-  && yum install -y --setopt=tsflags=nodocs \
+  yum update -y && \
+  yum install -y epel-release centos-release-scl && \
+  yum group install -y "Development Tools" && \
+  yum install -y --setopt=tsflags=nodocs \
     advancecomp \
     cmake3 \
     devtoolset-8-gcc \
@@ -20,8 +20,11 @@ RUN \
     jq \
     nasm \
     prelink \
-  && curl https://sh.rustup.rs -sSf | sh -s -- -y \
-  && ln -s /usr/bin/cmake3 /usr/bin/cmake
+    ninja-build && \
+  curl https://sh.rustup.rs -sSf | sh -s -- -y && \
+  ln -s /usr/bin/cmake3 /usr/bin/cmake && \
+  ln -s /usr/bin/ninja-build /usr/bin/ninja && \
+  pip3 install meson
 
 # Compiler settings
 ENV \

linuxmusl-x64/Dockerfile

@@ -8,9 +8,10 @@ RUN \
   apk update && apk upgrade && \
   apk --update --no-cache add \
     build-base curl git autoconf automake libtool intltool shared-mime-info nasm gtk-doc \
-    texinfo gperf glib-dev gobject-introspection-dev findutils jq linux-headers cmake && \
-  apk --update --no-cache --repository https://alpine.global.ssl.fastly.net/alpine/edge/community/ add cargo && \
-  apk --update --no-cache --repository https://alpine.global.ssl.fastly.net/alpine/edge/testing/ add advancecomp
+    texinfo gperf glib-dev gobject-introspection-dev findutils jq linux-headers cmake binutils python3 ninja && \
+  apk --update --no-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.10/community/ add cargo && \
+  apk --update --no-cache --repository https://alpine.global.ssl.fastly.net/alpine/edge/testing/ add advancecomp && \
+  pip3 install meson
 
 # Compiler settings
 ENV \