From 3ced3552a4e70137c5bbee7efaddcccbd76ae61a Mon Sep 17 00:00:00 2001
From: Jason Mobarak <jason@swiftnav.com>
Date: Tue, 16 Jan 2018 15:31:14 -0800
Subject: [PATCH 1/2] Switch back to Ubuntu 16.04

---
 Dockerfile                      |  4 ++--
 bin/arm-linux-gnueabihf-clang++ |  4 ++--
 bin/arm-linux-gnueabihf-objcopy |  2 +-
 docker_nametag                  |  2 +-
 stage_sysroot.bash              | 18 +++++++-----------
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f80da3b..2ec7204 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@
 # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
 RUN mkdir /work
 WORKDIR /work
@@ -16,7 +16,7 @@ WORKDIR /work
 RUN    apt-get update \
     && apt-get install -y wget \
     && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
-    && echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main" \
+    && echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \
           >/etc/apt/sources.list.d/llvm40.list \
     && apt-get update \
     && apt-get install -y libcurl4-openssl-dev \
diff --git a/bin/arm-linux-gnueabihf-clang++ b/bin/arm-linux-gnueabihf-clang++
index d4fa51d..6c76b22 100755
--- a/bin/arm-linux-gnueabihf-clang++
+++ b/bin/arm-linux-gnueabihf-clang++
@@ -44,8 +44,8 @@ else
     -B ${R}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8 \
     \
     -I ${R}/usr/arm-linux-gnueabihf/include \
-    -I ${R}/usr/arm-linux-gnueabihf/include/c++/4.8.4 \
-    -I ${R}/usr/arm-linux-gnueabihf/include/c++/4.8.4/arm-linux-gnueabihf \
+    -I ${R}/usr/arm-linux-gnueabihf/include/c++/4.8.5 \
+    -I ${R}/usr/arm-linux-gnueabihf/include/c++/4.8.5/arm-linux-gnueabihf \
     \
     -L ${R}/usr/arm-linux-gnueabi/libhf \
     -L ${R}/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8 \
diff --git a/bin/arm-linux-gnueabihf-objcopy b/bin/arm-linux-gnueabihf-objcopy
index 736708d..18a29e6 100755
--- a/bin/arm-linux-gnueabihf-objcopy
+++ b/bin/arm-linux-gnueabihf-objcopy
@@ -13,7 +13,7 @@
 D=$( (cd `dirname $0`/../.. >/dev/null; pwd -P) )
 R=$D/sysroot
 
-export LD_LIBRARY_PATH="${R}/usr/lib/x86_64-linux-gnu:${R}/usr/x86_64-linux-gnu/arm-linux-gnueabihf/lib"
+export LD_LIBRARY_PATH="${R}/usr/lib/x86_64-linux-gnu"
 
 exec ${R}/usr/bin/arm-linux-gnueabihf-objcopy $@
 
diff --git a/docker_nametag b/docker_nametag
index 773e8e8..81f2ee9 100644
--- a/docker_nametag
+++ b/docker_nametag
@@ -1 +1 @@
-swiftnav/arm-llvm-obf:4.0-ubuntu1404-2017.12.22
+swiftnav/arm-llvm-obf:4.0-ubuntu1604-2018.01.16
diff --git a/stage_sysroot.bash b/stage_sysroot.bash
index 91035be..ac232c6 100755
--- a/stage_sysroot.bash
+++ b/stage_sysroot.bash
@@ -48,7 +48,6 @@ stage_sysroot() {
     "/usr/arm-linux-gnueabihf"
     "/usr/arm-linux-gnueabi"
     "/usr/lib/gcc-cross/arm-linux-gnueabihf/4.8"
-    "/usr/x86_64-linux-gnu/arm-linux-gnueabihf/"
   )
 
   for SYSROOT_DIR in "${SYSROOT_DIRS[@]}"; do
@@ -87,16 +86,13 @@ stage_sysroot() {
   mkdir -p "${OUT}/buildroot"
   cp -v /this_dir/toolchainfile.cmake "${OUT}/buildroot"
 
-####
-## Disable this for Ubuntu 14.04, it doesn't seem to be present
-####
-#  D="${OUT}/usr/lib/x86_64-linux-gnu/"
-#
-#  mkdir -p "$D"
-#
-#  for ARMHF in /usr/lib/x86_64-linux-gnu/*armhf*; do
-#    cp -v "${ARMHF}" "$D/"
-#  done
+  D="${OUT}/usr/lib/x86_64-linux-gnu/"
+
+  mkdir -p "$D"
+
+  for ARMHF in /usr/lib/x86_64-linux-gnu/*armhf*; do
+    cp -v "${ARMHF}" "$D/"
+  done
 }
 
 run() {

From efa83a67ef2d1be3564b40cb9b7f3d2eeeaaa2e0 Mon Sep 17 00:00:00 2001
From: Jason Mobarak <jason@swiftnav.com>
Date: Wed, 17 Jan 2018 10:54:49 -0800
Subject: [PATCH 2/2] Also build example if other archs are built

Previously, we'd only build the example if we were only building arm.
---
 .travis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.sh b/.travis.sh
index 293e875..e08696b 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -52,7 +52,7 @@ echo 'DONE.'
 
 ### build_example.bash
 
-if [[ $ARCH = arm ]]; then
+if [[ $ARCH == *arm* ]]; then
 
   echo -n 'Building example project... '
   make NO_TTY=y build-example &>/tmp/build_example.bash.log