Update arpackg-ng package

diff --git a/deal.II-toolchain/packages/arpack-ng.package b/deal.II-toolchain/packages/arpack-ng.package
index fc6bcdb46fb6184abc13163b5a1cf161f9ef5aa6..6e40ef7d0525553659a0dfddcf71168d57cc0191 100644 (file)
--- a/deal.II-toolchain/packages/arpack-ng.package
+++ b/deal.II-toolchain/packages/arpack-ng.package
@@ -1,3 +1,7 @@
+################################################################################
+## ARPACK-NG                                                                  ##
+################################################################################
+
 VERSION=3.8.0
 NAME=arpack-ng.git
 EXTRACTSTO=arpack-ng-${VERSION}
@@ -9,21 +13,20 @@ BUILDDIR=${BUILD_PATH}/arpack-ng-${VERSION}
 INSTALL_PATH=${INSTALL_PATH}/arpack-ng-${VERSION}
 
 CONFOPTS="\
- -D CMAKE_INSTALL_LIBDIR=$INSTALL_PATH/lib \
- -D EXAMPLES=OFF \
- -D MPI=ON \
- -D BUILD_SHARED_LIBS=ON"
+  -D CMAKE_INSTALL_LIBDIR=${INSTALL_PATH}/lib \
+  -D EXAMPLES:BOOL=OFF \
+  -D MPI:BOOL=ON \
+  -D BUILD_SHARED_LIBS:BOOL=ON"
 
-package_specific_register () {
-    export ARPACK_DIR=${INSTALL_PATH}
+package_specific_register() {
+  export ARPACK_DIR=${INSTALL_PATH}
 }
 
-package_specific_conf () {
-    # Generate configuration file
-    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
-    rm -f $CONFIG_FILE
-    echo "
+package_specific_conf() {
+  # Generate configuration file
+  CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+  rm -f $CONFIG_FILE
+  echo "
 export ARPACK_DIR=${INSTALL_PATH}
-" >> $CONFIG_FILE
+" >>$CONFIG_FILE
 }
-

diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package
index 008660b32b24d4f10862cc5a23a735738ac4fa5b..7b096c5361a7597d7a58c5ab25ec496c88bbaa10 100644 (file)
--- a/deal.II-toolchain/packages/dealii.package
+++ b/deal.II-toolchain/packages/dealii.package
@@ -85,17 +85,24 @@ fi
 ################################################################################
 # Add additional packages, if present
 
-# arpack
+########################################
+# ARPACK
+if [[ ${PACKAGES_OFF} =~ 'arpack-ng' ]]; then
+    if [ ! -z "${ARPACK_DIR}" ]; then
+        cecho ${INFO} "deal.II: unset ARPACK_DIR due to forced DEAL_II_WITH_ARPACK:BOOL=OFF option"
+        unset ARPACK_DIR
+    fi
+fi
+
 if [ ! -z "${ARPACK_DIR}" ]; then
     cecho ${INFO} "deal.II: configuration with ARPACK"
     # We use a recent enough version of arpack, so PARPACK can be enabled
     # even though it is disabled by default, see 
     # https://github.com/dealii/dealii/blob/master/cmake/modules/FindARPACK.cmake
-    CONFOPTS="\
-        ${CONFOPTS} \
-        -D DEAL_II_WITH_ARPACK:BOOL=ON \
-        -D DEAL_II_ARPACK_WITH_PARPACK=ON \
-        -D ARPACK_DIR=${ARPACK_DIR}"
+    CONFOPTS="${CONFOPTS} \
+      -D DEAL_II_WITH_ARPACK:BOOL=ON \
+      -D DEAL_II_ARPACK_WITH_PARPACK:BOOL=ON \
+      -D ARPACK_DIR=${ARPACK_DIR}"
 fi
 
 # metis