From 570ff8bf2486915b82e1d2221a57376e36942062 Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Mon, 5 Jan 2015 21:07:57 -0800 Subject: [PATCH] Revert "let appveyor know about the version bump" This reverts commit b2a589d7dd258b631e404689382bdee5c593e916. Revert "build suitesparse-wrapper on appveyor" This reverts commit d8cf6feee7bb5db0e86b2183390c4a5b29911f63. SuiteSparse download is being flaky, we don't need to rebuild this bit at the moment. --- contrib/windows/msys_build.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/contrib/windows/msys_build.sh b/contrib/windows/msys_build.sh index 4325922c678da..9d7812fb8a541 100755 --- a/contrib/windows/msys_build.sh +++ b/contrib/windows/msys_build.sh @@ -159,7 +159,7 @@ if [ -z "`which make 2>/dev/null`" ]; then export PATH=$PWD/bin:$PATH fi -for lib in LLVM ARPACK BLAS LAPACK FFTW \ +for lib in LLVM SUITESPARSE ARPACK BLAS LAPACK FFTW \ GMP MPFR PCRE LIBUNWIND RMATH OPENSPECFUN; do echo "USE_SYSTEM_$lib = 1" >> Make.user done @@ -185,7 +185,6 @@ if [ -n "$USEMSVC" ]; then # Openlibm doesn't build well with MSVC right now echo 'USE_SYSTEM_OPENLIBM = 1' >> Make.user - echo 'USE_SYSTEM_SUITESPARSE = 1' >> Make.user # Since we don't have a static library for openlibm echo 'override UNTRUSTED_SYSTEM_LIBM = 0' >> Make.user @@ -195,13 +194,6 @@ if [ -n "$USEMSVC" ]; then echo 'override CC += -TP' >> Make.user else echo 'override STAGE1_DEPS += openlibm' >> Make.user - echo 'override STAGE3_DEPS += suitesparse-wrapper' >> Make.user - - # hack so all of suitesparse doesn't rebuild - echo 'override SUITESPARSE_VER = 4.4.1' >> Make.user - make -C deps SuiteSparse-4.4.1/Makefile - touch deps/SuiteSparse-4.4.1/UMFPACK/Lib/libumfpack.a - touch usr/bin/libspqr.dll fi make -j2