Try building snap version with GCC 8.

This commit is contained in:
John Preston 2019-06-04 01:30:05 +03:00
parent 9c613fe2f7
commit 1331e7089e

View file

@ -78,8 +78,8 @@ parts:
build-type: 'Release' build-type: 'Release'
artifacts: ['Telegram'] artifacts: ['Telegram']
environment: environment:
- CC: gcc-7 - CC: gcc-8
- CXX: g++-7 - CXX: g++-8
organize: organize:
Telegram: bin/Telegram Telegram: bin/Telegram
configflags: configflags:
@ -119,7 +119,7 @@ parts:
- openal - openal
- qt - qt
- range-v3 - range-v3
- gcc7 - gcc8
telegram-launcher: telegram-launcher:
plugin: dump plugin: dump
@ -323,10 +323,10 @@ parts:
- https://github.com/telegramdesktop/hime.git - https://github.com/telegramdesktop/hime.git
- https://github.com/telegramdesktop/nimf.git - https://github.com/telegramdesktop/nimf.git
environment: environment:
- CC: gcc-7 - CC: gcc-8
- CXX: g++-7 - CXX: g++-8
- QMAKE_CC: gcc-7 - QMAKE_CC: gcc-8
- QMAKE_CXX: g++-7 - QMAKE_CXX: g++-8
build-packages: build-packages:
- libasound2-dev - libasound2-dev
- libdbusmenu-glib-dev - libdbusmenu-glib-dev
@ -373,7 +373,7 @@ parts:
- tests - tests
after: after:
- libxkbcommon - libxkbcommon
- gcc7 - gcc8
prime: [-./*] prime: [-./*]
breakpad: breakpad:
@ -411,10 +411,10 @@ parts:
prime: [-./*] prime: [-./*]
# Since this is supposed to be built against ubuntu 16.04, we need to manually # Since this is supposed to be built against ubuntu 16.04, we need to manually
# install gcc7, and this is a workaround to achieve this. # install gcc8, and this is a workaround to achieve this.
# This part can be safely removed when build.snapcraft.io will allow # This part can be safely removed when build.snapcraft.io will allow
# to build against 18.04. # to build against 18.04.
gcc7: gcc8:
plugin: nil plugin: nil
build-packages: build-packages:
- libmpc-dev - libmpc-dev
@ -431,7 +431,7 @@ parts:
override-build: | override-build: |
set -x set -x
snapcraftctl build snapcraftctl build
sudo apt install gcc-7 g++-7 -o Debug::pkgProblemResolver=yes --no-install-recommends -y sudo apt install gcc-8 g++-8 -o Debug::pkgProblemResolver=yes --no-install-recommends -y
sudo apt-mark auto gcc-7 g++-7 sudo apt-mark auto gcc-8 g++-8
sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r.list sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r.list
prime: [-./*] prime: [-./*]