From 27d22296927d7e4ec0965f2bdaa272b1e8ea15e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ga=C3=ABl=20PORTAY?= Date: Mon, 5 Feb 2018 16:57:08 -0500 Subject: [PATCH] support/dependencies: add check for c++ multilib MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 8 ++++++++ support/docker/Dockerfile | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index a195c62c8c..1804e85508 100755 --- 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 474e073c61..ce3fdd9cc2 100644 --- 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 \ -- 2.30.2