From dcfcf945fd910e4b41ae807980c9e81b68e9fc4e Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Sat, 8 Nov 2014 00:48:54 -0800 Subject: [PATCH 1/2] Check if OSX bottles are fixed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 67b65b7e3b990..f282a14a5a25e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: cpp os: - linux -# - osx + - osx notifications: email: false irc: From 35e40921b5cacf6332c9bef8aa7a5b6428a7b2ba Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Sat, 8 Nov 2014 00:59:08 -0800 Subject: [PATCH 2/2] We installed libgit2, so now let's use it --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f282a14a5a25e..359486ebb6147 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ before_install: brew install -v --only-dependencies --HEAD julia; BUILDOPTS="USECLANG=1 LLVM_CONFIG=$(brew --prefix llvm33-julia)/bin/llvm-config-3.3 VERBOSE=1 USE_BLAS64=0 SUITESPARSE_INC=-I$(brew --prefix suite-sparse-julia)/include"; BUILDOPTS="$BUILDOPTS LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas"; - for lib in LLVM ZLIB SUITESPARSE ARPACK BLAS FFTW LAPACK GMP MPFR PCRE LIBUNWIND; do + for lib in LLVM ZLIB SUITESPARSE ARPACK BLAS FFTW LAPACK GMP MPFR PCRE LIBUNWIND LIBGIT2; do export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1"; done; export LDFLAGS="-L$(brew --prefix openblas-julia)/lib -L$(brew --prefix suite-sparse-julia)/lib";