Skip to content

Commit

Permalink
build suitesparse-wrapper on appveyor
Browse files Browse the repository at this point in the history
with a hack so the rest of suitesparse doesn't rebuild
  • Loading branch information
tkelman committed Dec 12, 2014
1 parent c88315e commit d8cf6fe
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion contrib/windows/msys_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ if [ -z "`which make 2>/dev/null`" ]; then
export PATH=$PWD/bin:$PATH
fi

for lib in LLVM SUITESPARSE ARPACK BLAS LAPACK FFTW \
for lib in LLVM ARPACK BLAS LAPACK FFTW \
GMP MPFR PCRE LIBUNWIND RMATH OPENSPECFUN; do
echo "USE_SYSTEM_$lib = 1" >> Make.user
done
Expand All @@ -169,6 +169,7 @@ 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

Expand All @@ -178,6 +179,12 @@ 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
make -C deps SuiteSparse-4.3.1/Makefile
touch deps/SuiteSparse-4.3.1/UMFPACK/Lib/libumfpack.a
touch usr/bin/libspqr.dll
fi

make -j2
Expand Down

2 comments on commit d8cf6fe

@tkelman
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll need to @JuliaBackports a modified version of this, with the different suitesparse version number that's still used on release-0.3, in order to backport #9189 without it failing on appveyor. This should be reverted on master when a new Windows nightly is available, and reverted on release-0.3 once a new release binary is available (so probably after 0.3.4).

@tkelman
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

backported in ad03a56

Please sign in to comment.