Commit 69dd4c6a authored by Dmitry Kazakov's avatar Dmitry Kazakov Committed by Ben Cooksley
Browse files

Add GCC9 to Krita AppImage base image

parent d2a47bf7
Pipeline #75263 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 && \
  • Heads up @bcooksley @dkazakov, this breaks dependency builds for Krita because binutils hasn't been updated to match: https://binary-factory.kde.org/job/Krita_Nightly_Appimage_Dependency_Build/168/console

  • It used to compile five here locally for some reason

  • Please send a Merge Request with the appropriate fix, otherwise we can always revert.

  • @dkazakov -- it's exiv2's manual application of -fcf-protection on xmpsdk. It generates Intel CET instructions that are too new for as to handle. I guess you must've configured the build with an older version, probably GCC 7.

    In any case, the Krita deps build will still fail because: OpenColorIO v1 sets -Werror while at the same time using auto_ptr, those are marked deprecated starting with GCC 6.

    Since we are blocked by both a too old binutils and an EOL'd library, the safest bet here is to revert.

  • Based on the above I have now reverted this and the corresponding changes in sysadmin/binary-factory-tooling.

  • Hi, @lsegovia!

    In any case, the Krita deps build will still fail because: OpenColorIO v1 sets -Werror while at the same time using auto_ptr, those are marked deprecated starting with GCC 6.

    But -Werror is patched out by us in OCIO deps build, isn't it?

  • No, you patch a double application of -Werror -- you didn't disable it. (I tested it last night with current master tip.)

Please register or sign in to reply
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