From 0bec11b126ae9a48a4b5970433093d35b5b0f4ba Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Tue, 11 Jul 2017 14:15:56 +0200 Subject: [PATCH] Fixing install SUITESPARSE on osx --- script/install_PETSC.sh | 2 ++ script/install_SUITESPARSE.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/script/install_PETSC.sh b/script/install_PETSC.sh index c01bc4b2a..9e3ad23f5 100755 --- a/script/install_PETSC.sh +++ b/script/install_PETSC.sh @@ -355,6 +355,8 @@ make install if [ ! "$(ls -A $1/PETSC)" ]; then rm -rf $1/PETSC else + #Mark the installation + echo 1 > $1/PETSC/version exit 0 fi diff --git a/script/install_SUITESPARSE.sh b/script/install_SUITESPARSE.sh index 94ad89608..ed0ee52da 100755 --- a/script/install_SUITESPARSE.sh +++ b/script/install_SUITESPARSE.sh @@ -23,18 +23,18 @@ cd SuiteSparse # configuration -if [ x"$platform" = x"osx" ]; then - # installation for OSX +#if [ x"$platform" = x"osx" ]; then +# # installation for OSX # sed -i "" -e "s| LAPACK = -llapack|LAPACK = |" SuiteSparse_config/SuiteSparse_config_Mac.mk # sed -i "" -e "s| BLAS = -lopenblas|BLAS = -L"$1"/OPENBLAS/lib -lopenblas|" SuiteSparse_config/SuiteSparse_config_Mac.mk ### Overwrite SuiteSparse_config.mk - rm SuiteSparse_config/SuiteSparse_config.mk - mv SuiteSparse_config/SuiteSparse_config_Mac.mk SuiteSparse_config/SuiteSparse_config.mk +# rm SuiteSparse_config/SuiteSparse_config.mk +# mv SuiteSparse_config/SuiteSparse_config_Mac.mk SuiteSparse_config/SuiteSparse_config.mk -else +#else # Installation for linux @@ -50,7 +50,7 @@ else # sed -i "/\sBLAS\s=\s\-lopenblas/c\BLAS = -L$1/OPENBLAS/lib -lopenblas -lpthread" SuiteSparse_config/SuiteSparse_config.mk # fi -fi +#fi export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$1/OPENBLAS/lib" -- GitLab