export BLAS_LIB, fix petsc

diff --git a/deal.II-toolchain/packages/openblas.package b/deal.II-toolchain/packages/openblas.package
index ee3837dd747bcbaa0a038b05fba420dda735c0eb..6623c1d49234380660813f0ab832772ceb69a109 100644 (file)
--- a/deal.II-toolchain/packages/openblas.package
+++ b/deal.II-toolchain/packages/openblas.package
@@ -23,6 +23,7 @@ package_specific_build () {
 package_specific_register () {
     export LAPACK_DIR=${INSTALL_PATH}/lib
     export BLAS_DIR=${INSTALL_PATH}/lib
+    export BLAS_LIB=${INSTALL_PATH}/lib/libopenblas.so
     # older cmake (for example 3.5) does not detect openblas by default so
     # we force detection by adding to the deal.II configure line:
     export DEAL_CONFOPTS="-D LAPACK_FOUND=true -D LAPACK_LIBRARIES=${INSTALL_PATH}/lib/libopenblas.so ${DEAL_CONFOPTS}"
@@ -35,5 +36,6 @@ package_specific_conf () {
     echo "
 export LAPACK_DIR=${INSTALL_PATH}/lib
 export BLAS_DIR=${INSTALL_PATH}/lib
+export BLAS_LIB=${INSTALL_PATH}/lib/libopenblas.so
 " >> $CONFIG_FILE
 }

diff --git a/deal.II-toolchain/packages/petsc.package b/deal.II-toolchain/packages/petsc.package
index 2fcb24ac80e4ed45bb8bab9d11d4fc2d05686d39..05c55829612c50bd4c3135513261b37984c5f084 100644 (file)
--- a/deal.II-toolchain/packages/petsc.package
+++ b/deal.II-toolchain/packages/petsc.package
@@ -65,6 +65,11 @@ if [ ! -z "${MKL_DIR}" ]; then
     cecho ${INFO} "petsc: configuration with MKL"
     cecho ${INFO} "petsc: configuration with blas-lapack-dir=${MKL_DIR}"
     CONFOPTS="${CONFOPTS} --with-blas-lapack-dir=${MKL_DIR}"
+else
+    if [ ! -z "${BLAS_LIB}" ]; then
+        cecho ${INFO} "petsc: configuration with --with-blas-lapack-lib=${BLAS_LIB}"
+        CONFOPTS="${CONFOPTS} --with-blas-lapack-lib=${BLAS_LIB}"
+    fi
 fi
 
 # Add ParMETIS, if present