From a5c85169da152efa5972fcd32a9417a2bcbfcf4e Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@nestlabs.com>
Date: Tue, 18 Oct 2016 13:08:22 -0700
Subject: [PATCH] Add arm-gcc54 to travis and -Wno-c++14-compat to CXXFLAGS.
 (#832)

---
 .travis.yml               |  5 ++++-
 .travis/before_install.sh | 10 +++++++++-
 .travis/script.sh         |  9 ++++++++-
 configure.ac              |  2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 07233db87..98b654068 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,10 @@ matrix:
     - env: BUILD_TARGET="scan-build"
       compiler: clang
       os: linux
-    - env: BUILD_TARGET="cc2538"
+    - env: BUILD_TARGET="arm-gcc49"
+      compiler: gcc
+      os: linux
+    - env: BUILD_TARGET="arm-gcc54"
       compiler: gcc
       os: linux
     - env: BUILD_TARGET="posix"
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index f35ff4586..a054ed921 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -67,7 +67,7 @@ cd /tmp || die
         sudo apt-get install clang || die
     }
 
-    [ $BUILD_TARGET != cc2538 ] || {
+    [ $BUILD_TARGET != arm-gcc49 ] || {
         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
@@ -75,6 +75,14 @@ cd /tmp || die
         arm-none-eabi-gcc --version || die
     }
 
+    [ $BUILD_TARGET != arm-gcc54 ] || {
+        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
+        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 != posix-32-bit ] || {
         sudo apt-get install g++-multilib || die
     }
diff --git a/.travis/script.sh b/.travis/script.sh
index 266cfd51f..dc21066cf 100755
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -47,13 +47,20 @@ set -x
     scan-build --status-bugs -analyze-headers -v make || die
 }
 
-[ $BUILD_TARGET != cc2538 ] || {
+[ $BUILD_TARGET != arm-gcc49 ] || {
     export PATH=/tmp/gcc-arm-none-eabi-4_9-2015q3/bin:$PATH || die
     COMMISSIONER=1 JOINER=1 make -f examples/Makefile-cc2538 || die
     arm-none-eabi-size  output/bin/arm-none-eabi-ot-cli || die
     arm-none-eabi-size  output/bin/arm-none-eabi-ot-ncp || die
 }
 
+[ $BUILD_TARGET != arm-gcc54 ] || {
+    export PATH=/tmp/gcc-arm-none-eabi-5_4-2016q3/bin:$PATH || die
+    COMMISSIONER=1 JOINER=1 make -f examples/Makefile-cc2538 || die
+    arm-none-eabi-size  output/bin/arm-none-eabi-ot-cli || die
+    arm-none-eabi-size  output/bin/arm-none-eabi-ot-ncp || die
+}
+
 [ $BUILD_TARGET != posix ] || {
     make -f examples/Makefile-posix || die
 }
diff --git a/configure.ac b/configure.ac
index 25679c3f8..b6c632d9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -224,7 +224,7 @@ AC_PROG_LN_S
 #
 
 PROSPECTIVE_CFLAGS="-Wall -Wextra -Wshadow -Werror -std=c99 -pedantic-errors"
-PROSPECTIVE_CXXFLAGS="-Wall -Wextra -Wshadow -Werror"
+PROSPECTIVE_CXXFLAGS="-Wall -Wextra -Wshadow -Werror -Wno-c++14-compat"
 
 AC_CACHE_CHECK([whether $CC is Clang],
     [nl_cv_clang],