diff deploy/linux/docker/Dockerfile_appimage.in @ 1976:810a0b8f5472 c++14

Requiring c++14 is not going to work for Travis (because we want to support a Qt version too old to know about the c++14 config flag) or for our AppImage build (because we want to run on distros to old to support the relevant gcc ABI). So instead we try to confine the C++ standard selection to one place (config/noconfig) and revert to c++11 if the compiler is too old to know about c++14. All of the actual SV code remains c++11, and we assume we build against an older version of capnproto when we want to perform a c++11 build.

--- a/deploy/linux/docker/Dockerfile_appimage.in	Fri Aug 31 12:16:59 2018 +0100
+++ b/deploy/linux/docker/Dockerfile_appimage.in	Fri Aug 31 13:41:27 2018 +0100
@@ -40,16 +40,12 @@
 # actually linking against it. We also have Pulse as the default I/O.
 
 RUN apt-add-repository -y ppa:beineri/opt-qt-5.10.1-trusty
-RUN apt-add-repository -y ppa:ubuntu-toolchain-r/test
 RUN apt-get update && \
     apt-get install -y \
-    g++-4.9 \
     qt510base \
     qt510svg
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN for x in g++ gcc gcc-ar gcc-nm gcc-ranlib ; do ln -sf /usr/bin/$x-4.9 /usr/bin/$x ; ln -sf /usr/bin/x86_64-linux-gnu-gcc-$x-4.9 /usr/bin/x86_64-linux-gnu-gcc-$x ; done
-
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8  
 ENV LANGUAGE en_US:en  
@@ -59,7 +55,7 @@
 
 RUN git clone https://github.com/sandstorm-io/capnproto
 WORKDIR capnproto
-RUN git checkout v0.7.0
+RUN git checkout v0.6.0
 WORKDIR c++
 RUN autoreconf -i && ./configure && make -j3 && make install