[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [sysadmin/ci-tooling] system-images/appimage-base: Include GCC 6 in our Appimage Base system.
From:       Ben Cooksley <null () kde ! org>
Date:       2018-09-01 5:10:07
Message-ID: E1fvyAh-00023p-S0 () code ! kde ! org
[Download RAW message or body]

Git commit 2032de6e997651f749fb4da8eee3c88df38e76a8 by Ben Cooksley.
Committed on 01/09/2018 at 05:09.
Pushed by bcooksley into branch 'master'.

Include GCC 6 in our Appimage Base system.
The list of requirements for getting KMyMoney Appimages built is starting t=
o get painful.

Ref T9071

M  +4    -1    system-images/appimage-base/Dockerfile

https://commits.kde.org/sysadmin/ci-tooling/2032de6e997651f749fb4da8eee3c88=
df38e76a8

diff --git a/system-images/appimage-base/Dockerfile b/system-images/appimag=
e-base/Dockerfile
index dce0ece..f6ec230 100644
--- a/system-images/appimage-base/Dockerfile
+++ b/system-images/appimage-base/Dockerfile
@@ -10,12 +10,15 @@ USER root
 RUN apt-get update && apt-get install -y software-properties-common python=
-software-properties && add-apt-repository -y ppa:openjdk-r/ppa
 RUN apt-get update && apt-get upgrade -y && apt-get install -y openssh-ser=
ver openjdk-8-jre-headless
 =

+# Some software demands a newer GCC because they're using C++14 stuff, whi=
ch is just insane
+RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test && apt-get update
+
 # Now install the general dependencies we need for builds
 RUN apt-get install -y \
   # General requirements for building KDE software
   build-essential cmake3 git-core \
   # General requirements for building other software
-  automake \
+  automake gcc-6 g++-6 \
   # Needed for some frameworks
   bison gettext \
   # Qt and KDE Build Dependencies
[prev in list] [next in list] [prev in thread] [next in thread]