From b684db0f1ff5b708954f6df7ebf2ede19ab8df77 Mon Sep 17 00:00:00 2001
From: Tony Kelman <tony@kelman.net>
Date: Thu, 25 Feb 2016 18:52:08 -0800
Subject: [PATCH] attempt to fix 32 bit linux travis

apt-get plugin changed behavior today, causing a dpkg configuration
failure that was previously non-fatal to now cause the build to error

[av skip]

setting ARCH in Make.user appears to be the only way to get multilib
32 bit compilation working without breaking either libgit2 or openblas

Add more gcc-5 symlinks for llvm
---
 .travis.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b0ec57b51205b..e396552fa720e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,13 +12,15 @@ matrix:
           packages:
             - bar
             - time
-            - binutils:i386
-            - gcc-5:i386
-            - g++-5:i386
+            - binutils
+            - gcc-5
+            - g++-5
+            - gcc-5-multilib
+            - g++-5-multilib
             - make:i386
-            - cpp-5:i386
             - libssl-dev:i386
-            - gfortran-5:i386
+            - gfortran-5
+            - gfortran-5-multilib
     - os: linux
       env: ARCH="x86_64"
       compiler: "g++-5 -m64"
@@ -61,8 +63,11 @@ before_install:
         ln -s /usr/bin/gcc-5 $HOME/bin/gcc;
         ln -s /usr/bin/g++-5 $HOME/bin/g++;
         ln -s /usr/bin/gfortran-5 $HOME/bin/gfortran;
+        ln -s /usr/bin/gcc-5 $HOME/bin/x86_64-linux-gnu-gcc;
+        ln -s /usr/bin/g++-5 $HOME/bin/x86_64-linux-gnu-g++;
         gcc --version;
         BUILDOPTS="-j3 VERBOSE=1 FORCE_ASSERTIONS=1";
+        echo "override ARCH=$ARCH" >> Make.user;
         TESTSTORUN="all";
       elif [ `uname` = "Darwin" ]; then
         brew update;