Commit d084d449 authored by Ben Cooksley's avatar Ben Cooksley
Browse files

Revert "Revert "Add GCC9 to Krita AppImage base image""

As it turns out Kdenlive had begun using GCC 9 and hadn't let us know.
Make GCC 9 available again to unbreak their builds.

This reverts commit 5e3bb14c.
parent 5e3bb14c
Pipeline #79950 skipped with stage
......@@ -27,7 +27,7 @@ RUN apt-get install -y \
# General requirements for building KDE software
build-essential cmake git-core locales \
# General requirements for building other software
automake gcc-6 g++-6 libxml-parser-perl libpq-dev libaio-dev \
automake gcc-6 g++-6 gcc-9 g++-9 libxml-parser-perl libpq-dev libaio-dev \
# Needed for some frameworks
bison gettext \
# Qt and KDE Build Dependencies
......@@ -49,6 +49,13 @@ RUN apt-get install -y \
RUN add-apt-repository -y ppa:deadsnakes/ppa && apt-get update && apt-get install -y python3.9 python3.9-dev python3.9-venv && python3.9 -m ensurepip
RUN python3.9 -m pip install meson ninja
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 10 && \
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 20 && \
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 30 && \
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 10 && \
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 20 && \
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 30
# Setup a user account for everything else to be done under
RUN useradd -d /home/appimage/ -u 1000 --user-group --create-home -G video appimage
# Make sure SSHD will be able to startup
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment