From e63cf30abfbc5e1c9de5cb0ba36cc8115b7a4208 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Mon, 18 May 2020 09:41:43 -0400 Subject: [PATCH] update slepc/petsc version to 3.13.x This is required as our old version only supports Python 2.x, which is end-of-life now. --- deal.II-toolchain/packages/petsc.package | 16 ++++++++++------ deal.II-toolchain/packages/slepc.package | 16 ++++++++++------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/deal.II-toolchain/packages/petsc.package b/deal.II-toolchain/packages/petsc.package index d60cbb7..ed434c7 100644 --- a/deal.II-toolchain/packages/petsc.package +++ b/deal.II-toolchain/packages/petsc.package @@ -1,5 +1,8 @@ -VERSION=3.11.3 -CHECKSUM=e04cbb1aaccde4a33c8843e75a1fba15 +VERSION=3.13.1 +CHECKSUM=b8b99c4a16fbc7d6694a70af044dbaac + +#VERSION=3.11.3 +#CHECKSUM=e04cbb1aaccde4a33c8843e75a1fba15 #VERSION=3.7.6 #CHECKSUM=152c1f15f535af22fc015de1d3099db3 @@ -16,16 +19,17 @@ BUILDCHAIN=custom INSTALL_PATH=${INSTALL_PATH}/${EXTRACTSTO} -# Note that PETSc ./configure currently does not support python3, but some -# distros might ship with python3 as the default "python". So select python2 -# or python2.7 if available, otherwise use python or what the user supplied in -# PYTHON_INTERPRETER. +# Note that older PETSc ./configure only supports python2. For now, prefer +# using python2 but use what the user supplies as PYTHON_INTERPRETER. if builtin command -v python2 --version > /dev/null; then default PYTHON_INTERPRETER="python2" fi if builtin command -v python2.7 --version > /dev/null; then default PYTHON_INTERPRETER="python2.7" fi +if builtin command -v python3 --version > /dev/null; then + default PYTHON_INTERPRETER="python3" +fi default PYTHON_INTERPRETER="python" diff --git a/deal.II-toolchain/packages/slepc.package b/deal.II-toolchain/packages/slepc.package index 4118f5b..5f6e49a 100644 --- a/deal.II-toolchain/packages/slepc.package +++ b/deal.II-toolchain/packages/slepc.package @@ -1,5 +1,8 @@ -VERSION=3.11.2 -CHECKSUM=89abc5a197dd696a3c73f00f48699d7b +VERSION=3.13.2 +CHECKSUM=74af8d2ff74aa8b1a75a5e96e17ab7d8 + +#VERSION=3.11.2 +#CHECKSUM=89abc5a197dd696a3c73f00f48699d7b #VERSION=3.7.3 #CHECKSUM=c7edcb13e0b19e2cf263301962b38f75 @@ -15,16 +18,17 @@ BUILDCHAIN=custom INSTALL_PATH=${INSTALL_PATH}/${NAME} -# Note that SLEPc ./configure currently does not support python3, but some -# distros might ship with python3 as the default "python". So select python2 -# or python2.7 if available, otherwise use python or what the user supplied in -# PYTHON_INTERPRETER. +# Note that older SLEPc ./configure only supports python2. For now, prefer +# using python2 but use what the user supplies as PYTHON_INTERPRETER. if builtin command -v python2 --version > /dev/null; then default PYTHON_INTERPRETER="python2" fi if builtin command -v python2.7 --version > /dev/null; then default PYTHON_INTERPRETER="python2.7" fi +if builtin command -v python3 --version > /dev/null; then + default PYTHON_INTERPRETER="python3" +fi default PYTHON_INTERPRETER="python" -- 2.39.5