From 2ee12f0bcbc2b9c3bae7ae5d423fc9aab8c9ce5d Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sun, 7 Apr 2019 02:36:45 -0400 Subject: [PATCH] Okay we do want GCC 5 after all, and also ugh in general --- azure-pipelines.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 780cedcd..8ac8a186 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,12 +14,11 @@ jobs: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - script: | - gcc --version; exit 1 sudo dpkg --add-architecture i386 sudo apt-get update - sudo apt-get install gcc-6-multilib g++-6-multilib libc-dev:i386 + sudo apt-get install gcc-multilib g++-multilib # the ones after ninja-build fix broken dependencies of libgtk-3-0:i386 - sudo apt-get install libgtk-3-0:i386 libgtk-3-dev:i386 ninja-build libgirepository-1.0-1:i386 libglib2.0-dev:i386 gir1.2-glib-2.0:i386 gir1.2-atk-1.0:i386 libatk1.0-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcairo2-dev:i386 libgdk-pixbuf2.0-dev:i386 libpango1.0-dev:i386 libxft-dev:i386 libpng12-dev:i386 + sudo apt-get install libc6:i386 libc6-dev:i386 libgtk-3-0:i386 libgtk-3-dev:i386 ninja-build # libgirepository-1.0-1:i386 libglib2.0-dev:i386 gir1.2-glib-2.0:i386 gir1.2-atk-1.0:i386 libatk1.0-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcairo2-dev:i386 libgdk-pixbuf2.0-dev:i386 libpango1.0-dev:i386 libxft-dev:i386 libpng12-dev:i386 displayName: 'Install Dependencies' - template: azure-pipelines/configure.yml parameters: @@ -48,7 +47,7 @@ jobs: sudo apt-get update sudo apt-get install gcc-multilib g++-multilib # the ones after ninja-build fix broken dependencies of libgtk-3-0:i386 - sudo apt-get install libc-dev:i386 libgtk-3-dev:i386 ninja-build libgirepository-1.0-1:i386 libglib2.0-dev:i386 gir1.2-glib-2.0:i386 gir1.2-atk-1.0:i386 libatk1.0-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcairo2-dev:i386 libgdk-pixbuf2.0-dev:i386 libpango1.0-dev:i386 libxft-dev:i386 libpng12-dev:i386 + sudo apt-get install libc6:i386 libc6-dev:i386 libgtk-3-0:i386 libgtk-3-dev:i386 ninja-build # libgirepository-1.0-1:i386 libglib2.0-dev:i386 gir1.2-glib-2.0:i386 gir1.2-atk-1.0:i386 libatk1.0-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcairo2-dev:i386 libgdk-pixbuf2.0-dev:i386 libpango1.0-dev:i386 libxft-dev:i386 libpng12-dev:i386 displayName: 'Install Dependencies' - template: azure-pipelines/configure.yml parameters: