From 1fc9ffc8c125894776d945d39554d8de09b15657 Mon Sep 17 00:00:00 2001
From: Gilles Gouaillardet <gilles@rist.or.jp>
Date: Thu, 26 May 2016 15:28:10 +0900
Subject: [PATCH 1/2] travis: fix a typo and create bogus directories to avoid
 compiler warnings

(back-ported from commit 46710ba151f3edbee56f630cf332c2ba8d72cbfe)
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1e4d5445474..daf40cf53d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ env:
     global:
         - AM_MAKEFLAGS="-j4"
         - CPPFLAGS="-I$HOME/bogus/include"
-        - LDFLAGS="-I$HOME/bogus/lib"
+        - LDFLAGS="-L$HOME/bogus/lib"
         - LD_LIBRARY_PATH="$HOME/bogus/lib"
     matrix:
         - GCC_VERSION=default

From 832b4f5da7c2dd8284b01aef460d00f8a3a14d61 Mon Sep 17 00:00:00 2001
From: Gilles Gouaillardet <gilles@rist.or.jp>
Date: Wed, 21 Sep 2016 13:40:34 +0900
Subject: [PATCH 2/2] travis: always run 'brew update; brew upgrade automake
 libtool' on OSX

(cherry picked from commit af7fd57b45aebf9abd98794fe704f65089f88eef)
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index daf40cf53d6..e79eadc1fb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,8 @@ before_install:
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/ofiwg/libfabric.git ; fi
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$GCC_VERSION" == "6" ]] ; then sudo apt-get --assume-yes install gcc-6 g++-6 gfortran-6; fi
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd libfabric && ./autogen.sh && ./configure --prefix=$HOME/bogus --enable-usnic --disable-verbs $COMPILERS && make install && cd .. ; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$GCC_VERSION" == "6" ]] ; then brew update; brew upgrade automake libtool gcc; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew upgrade automake libtool; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$GCC_VERSION" == "6" ]] ; then brew upgrade gcc; fi
     - mkdir -p $HOME/bogus/include $HOME/bogus/lib
 
 # Note that we use "make -k" to do the entire build, even if there was a