support/dependencies: add check for c++ multilib

Some packages build C++ 32bits host-tools and need the g++-multilib to
be installed on the build machine. As example, qt5webengine builds a C++
host-tool when target is 32bits.

Add the check for g++-multilib to the dependencies script; and update
the Dockerfile to install g++-multilib package.

Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index a195c62c8ccea091eb593996def3c3804f5a2b10..1804e8550811ab1a54e2b6d9af2dcfd7d20e04ab 100755 (executable)
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -249,6 +249,14 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then
                echo "For other distributions, refer to their documentation."
                exit 1
        fi
+
+       if ! echo "int main(void) {}" | g++ -m32 -x c++ - -o /dev/null 2>/dev/null; then
+               echo
+               echo "Your Buildroot configuration needs a compiler capable of building 32 bits binaries."
+               echo "If you're running a Debian/Ubuntu distribution, install the g++-multilib package."
+               echo "For other distributions, refer to their documentation."
+               exit 1
+       fi
 fi
 
 # Check that the Perl installation is complete enough for Buildroot.

diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
index 474e073c613c77243e9a8ed7ee2afef659140239..ce3fdd9cc22614cedce07852cbe572ac452c674c 100644 (file)
--- a/support/docker/Dockerfile
+++ b/support/docker/Dockerfile
@@ -22,7 +22,7 @@ COPY apt-sources.list /etc/apt/sources.list
 RUN dpkg --add-architecture i386 && \
     apt-get update -y && \
     apt-get install -y --no-install-recommends \
-        build-essential cmake libc6:i386 gcc-multilib \
+        build-essential cmake libc6:i386 g++-multilib \
         bc ca-certificates file locales rsync \
         cvs bzr git mercurial subversion wget \
         cpio unzip \