From ffff5f3f6ffcc32f31e0af90305ce421af9ccfd7 Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@nestlabs.com>
Date: Mon, 30 Jul 2018 10:46:28 -0500
Subject: [PATCH] [travis] remove lib32z1 from arm-gcc-6/7 build checks (#2928)

---
 .travis.yml               |  8 ++++----
 .travis/before_install.sh | 12 +++++-------
 .travis/script.sh         |  8 ++++----
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4820f1b2a..bbfb5b524 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -92,16 +92,16 @@ matrix:
             - llvm-toolchain-trusty-5.0
           packages:
             - clang-5.0
-    - env: BUILD_TARGET="arm-gcc49"
+    - env: BUILD_TARGET="arm-gcc-4"
       os: linux
       compiler: gcc
-    - env: BUILD_TARGET="arm-gcc54"
+    - env: BUILD_TARGET="arm-gcc-5"
       os: linux
       compiler: gcc
-    - env: BUILD_TARGET="arm-gcc63"
+    - env: BUILD_TARGET="arm-gcc-6"
       os: linux
       compiler: gcc
-    - env: BUILD_TARGET="arm-gcc7"
+    - env: BUILD_TARGET="arm-gcc-7"
       os: linux
       compiler: gcc
     - env: BUILD_TARGET="posix" CC=clang-5.0 CXX=clang++-5.0
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index 74d423c0a..8139e778e 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -60,7 +60,7 @@ cd /tmp || die
         sudo apt-get install clang || die
     }
 
-    [ $BUILD_TARGET != arm-gcc49 ] || {
+    [ $BUILD_TARGET != arm-gcc-4 ] || {
         sudo apt-get install lib32z1 || die
         wget https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update/+download/gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 || die
         tar xjf gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 || die
@@ -68,16 +68,15 @@ cd /tmp || die
         arm-none-eabi-gcc --version || die
     }
 
-    [ $BUILD_TARGET != arm-gcc54 ] || {
+    [ $BUILD_TARGET != arm-gcc-5 ] || {
         sudo apt-get install lib32z1 || die
-        wget https://launchpad.net/gcc-arm-embedded/5.0/5-2016-q3-update/+download/gcc-arm-none-eabi-5_4-2016q3-20160926-linux.tar.bz2 || die
+        wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/5_4-2016q3/gcc-arm-none-eabi-5_4-2016q3-20160926-linux.tar.bz2 || die
         tar xjf gcc-arm-none-eabi-5_4-2016q3-20160926-linux.tar.bz2 || die
         export PATH=/tmp/gcc-arm-none-eabi-5_4-2016q3/bin:$PATH || die
         arm-none-eabi-gcc --version || die
     }
 
-    [ $BUILD_TARGET != arm-gcc63 ] || {
-        sudo apt-get install lib32z1 || die
+    [ $BUILD_TARGET != arm-gcc-6 ] || {
         wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 || die
         tar xjf gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 || die
         export PATH=/tmp/gcc-arm-none-eabi-6-2017-q2-update/bin:$PATH || die
@@ -89,8 +88,7 @@ cd /tmp || die
         arc-elf32-gcc --version || die
     }
 
-    [ $BUILD_TARGET != arm-gcc7 ] || {
-        sudo apt-get install lib32z1 || die
+    [ $BUILD_TARGET != arm-gcc-7 ] || {
         wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2017q4/gcc-arm-none-eabi-7-2017-q4-major-linux.tar.bz2 || die
         tar xjf gcc-arm-none-eabi-7-2017-q4-major-linux.tar.bz2 || die
         export PATH=/tmp/gcc-arm-none-eabi-7-2017-q4-major/bin:$PATH || die
diff --git a/.travis/script.sh b/.travis/script.sh
index e4717bd4a..8f747a25c 100755
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -121,7 +121,7 @@ EOF
     test -f out/target/product/generic/obj/EXECUTABLES/ot-cli_intermediates/LINKED/ot-cli || die
 }
 
-[ $BUILD_TARGET != arm-gcc49 ] || {
+[ $BUILD_TARGET != arm-gcc-4 ] || {
     export PATH=/tmp/gcc-arm-none-eabi-4_9-2015q3/bin:$PATH || die
 
     git checkout -- . || die
@@ -199,7 +199,7 @@ EOF
     arm-none-eabi-size  output/samr21/bin/ot-ncp-mtd || die
 }
 
-[ $BUILD_TARGET != arm-gcc54 ] || {
+[ $BUILD_TARGET != arm-gcc-5 ] || {
     export PATH=/tmp/gcc-arm-none-eabi-5_4-2016q3/bin:$PATH || die
 
     git checkout -- . || die
@@ -277,7 +277,7 @@ EOF
     arm-none-eabi-size  output/samr21/bin/ot-ncp-mtd || die
 }
 
-[ $BUILD_TARGET != arm-gcc63 ] || {
+[ $BUILD_TARGET != arm-gcc-6 ] || {
     export PATH=/tmp/gcc-arm-none-eabi-6-2017-q2-update/bin:$PATH || die
 
     git checkout -- . || die
@@ -366,7 +366,7 @@ EOF
     arc-elf32-size  output/emsk/bin/ot-ncp-mtd || die
 }
 
-[ $BUILD_TARGET != arm-gcc7 ] || {
+[ $BUILD_TARGET != arm-gcc-7 ] || {
     export PATH=/tmp/gcc-arm-none-eabi-7-2017-q4-major/bin:$PATH || die
 
     git checkout -- . || die