From 8af12fcc1380928c8bbcbd5f2349e1e24d485a47 Mon Sep 17 00:00:00 2001
From: Carlos Garces <carlos.garces@gmail.com>
Date: Sun, 5 Jan 2020 19:35:29 +0100
Subject: [PATCH] Fix travis build GCC 8 and 9

---
 .travis.yml | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d5b2f5e..e7aa923 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: c
 compiler: gcc
 sudo: required
-dist: disco
+dist: bionic
 
 before_install:
   - export ALL_DEB=$(wget --quiet -O - ${KERNEL_URL}v${KVER}/ | grep -o 'href=".*"' | grep -m1 all | cut -d '"' -f 2)
@@ -22,19 +22,21 @@ matrix:
       addons:
         apt:
           sources:
-            - ubuntu-toolchain-r-test
+            - sourceline: "ppa:ubuntu-toolchain-r/test"
           packages:
             - gcc-9
       env: COMPILER=gcc-9 KVER=5.4.8
     - compiler: gcc
+      addons:
+        apt:
+          packages:
+            - gcc-8
       env: COMPILER=gcc-8 KVER=5.4.8
     - compiler: gcc
       env: COMPILER=gcc-7 KVER=5.4.8
     - compiler: gcc
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
           packages:
             - gcc-6
       env: COMPILER=gcc-6 KVER=5.4.8
@@ -42,28 +44,23 @@ matrix:
       addons:
         apt:
           sources:
-            - ubuntu-toolchain-r-test
+            - sourceline: "ppa:ubuntu-toolchain-r/test"
           packages:
             - gcc-9
-      env: COMPILER=gcc-9 KVER=4.19.86
-    - compiler: gcc
-      env: COMPILER=gcc-8 KVER=4.19.86
-    - compiler: gcc
-      env: COMPILER=gcc-7 KVER=4.19.86
+      env: COMPILER=gcc-9 KVER=4.19.93
+    - compiler: gcc
+      addons:
+        apt:
+          packages:
+            - gcc-8
+      env: COMPILER=gcc-8 KVER=4.19.93
+    - compiler: gcc
+      env: COMPILER=gcc-7 KVER=4.19.93
     - compiler: gcc
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
           packages:
             - gcc-6
-      env: COMPILER=gcc-6 KVER=4.19.86
+      env: COMPILER=gcc-6 KVER=4.19.93
     - compiler: gcc
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:ondrej/nginx-mainline'
-          packages:
-            - gcc-7
       env: COMPILER=gcc-7 KVER=4.15.18