From c2b821f3139341e6294ce81f2b16bc0a76c1430e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 23 Oct 2020 17:33:02 -0400
Subject: [PATCH] docker: ubuntu 18.04 i386 must use g++8
Change-Id: I5a43f4ca5d0c8e43b3f73cb028aeb38c31b16342
---
docker/Dockerfile_ubuntu_18.04_i386 | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/docker/Dockerfile_ubuntu_18.04_i386 b/docker/Dockerfile_ubuntu_18.04_i386
index cdeb1969..55ad8325 100644
--- a/docker/Dockerfile_ubuntu_18.04_i386
+++ b/docker/Dockerfile_ubuntu_18.04_i386
@@ -10,12 +10,18 @@ RUN apt-get update && \
RUN apt-get clean
RUN apt-get update && \
apt-get install -y -o Acquire::Retries=10 \
+ g++-8 \
+ gcc-8 \
+ cpp-8 \
+ file \
+ make \
+ libc6-dev \
+ libstdc++-8-dev \
git \
autoconf \
automake \
autopoint \
cmake \
- libtool \
libdbus-1-dev \
libdbus-c++-dev \
libgnutls28-dev \
@@ -65,6 +71,9 @@ RUN apt-get update && \
libssl-dev \
libsndfile1-dev
+RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50
+
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
CMD /opt/build-package-debian.sh
--
GitLab