From 3a49824b1bf15ffb6425177b2572e4e40a793dcc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Thu, 1 Jul 2021 13:29:37 +0200 Subject: [PATCH] prepare master for sync of v9.x branches --- deal.II-toolchain/packages/arpack-ng.package | 1 - deal.II-toolchain/packages/dealii.package | 3 --- deal.II-toolchain/packages/gmsh.package | 8 +++---- .../packages/opencascade.package | 11 ++++------ deal.II-toolchain/packages/p4est.package | 3 ++- .../packages/superlu_dist.package | 2 +- deal.II-toolchain/packages/trilinos.package | 2 +- .../platforms/deprecated/fedora22.platform | 22 ------------------- .../platforms/deprecated/fedora23.platform | 22 ------------------- ...{mojave.platform => macos_mojave.platform} | 0 10 files changed, 12 insertions(+), 62 deletions(-) delete mode 100644 deal.II-toolchain/platforms/deprecated/fedora22.platform delete mode 100644 deal.II-toolchain/platforms/deprecated/fedora23.platform rename deal.II-toolchain/platforms/supported/{mojave.platform => macos_mojave.platform} (100%) diff --git a/deal.II-toolchain/packages/arpack-ng.package b/deal.II-toolchain/packages/arpack-ng.package index fc6bcdb..7450f00 100644 --- a/deal.II-toolchain/packages/arpack-ng.package +++ b/deal.II-toolchain/packages/arpack-ng.package @@ -26,4 +26,3 @@ package_specific_conf () { export ARPACK_DIR=${INSTALL_PATH} " >> $CONFIG_FILE } - diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package index 008660b..e225e1c 100644 --- a/deal.II-toolchain/packages/dealii.package +++ b/deal.II-toolchain/packages/dealii.package @@ -288,15 +288,12 @@ if [ ! -z "${ADOLC_DIR}" ]; then fi ################################################################################ - package_specific_install() { if [ ${RUN_DEAL_II_TESTS} = ON ]; then make test 2>&1 | tee candi_test.log fi } - - package_specific_conf() { ############################################################################ # Generate modulefile diff --git a/deal.II-toolchain/packages/gmsh.package b/deal.II-toolchain/packages/gmsh.package index b4a816b..5acf082 100644 --- a/deal.II-toolchain/packages/gmsh.package +++ b/deal.II-toolchain/packages/gmsh.package @@ -21,15 +21,15 @@ if [ ${CANDI_GMSH_LOAD_TARBALL} = ON ]; then # CHECKSUM=762c10f159dab4b042e3140b1c348427 NAME=gmsh-${VERSION}-source - SOURCE=http://gmsh.info/src/ - EXTRACTSTO=gmsh-${VERSION}-source PACKING=.tgz + EXTRACTSTO=gmsh-${VERSION}-source + SOURCE=http://gmsh.info/src/ else VERSION=gmsh_4_8_4 NAME=gmsh.git - SOURCE=https://gitlab.onelab.info/gmsh/ - EXTRACTSTO=${VERSION} PACKING=git + EXTRACTSTO=${VERSION} + SOURCE=https://gitlab.onelab.info/gmsh/ fi unset CANDI_GMSH_LOAD_TARBALL diff --git a/deal.II-toolchain/packages/opencascade.package b/deal.II-toolchain/packages/opencascade.package index 9a6ea9c..7cfce9e 100644 --- a/deal.II-toolchain/packages/opencascade.package +++ b/deal.II-toolchain/packages/opencascade.package @@ -27,20 +27,17 @@ if [ ${CANDI_OPENCASCADE_LOAD_TARBALL} = ON ]; then PACKING=.tar.gz else # download git repository (huge download) - # if possible, try to download a release tarball (see above) # checkout specific release version - # VERSION=OCE-0.18.3 - # VERSION=OCE-0.18.2 - - # or checkout current development version (master) VERSION=master + #VERSION=OCE-0.18.3 + #VERSION=OCE-0.18.2 # set up git repository NAME=oce.git - SOURCE=https://github.com/tpaviot/ - EXTRACTSTO=OCE-${VERSION} PACKING=git + EXTRACTSTO=OCE-${VERSION} + SOURCE=https://github.com/tpaviot/ fi unset CANDI_OPENCASCADE_LOAD_TARBALL diff --git a/deal.II-toolchain/packages/p4est.package b/deal.II-toolchain/packages/p4est.package index 085f82b..3cba833 100644 --- a/deal.II-toolchain/packages/p4est.package +++ b/deal.II-toolchain/packages/p4est.package @@ -11,9 +11,10 @@ CHECKSUM="${CHECKSUM} 28cbaf51a335c8cc8e78bb38bbb99251ba7ebf80" CHECKSUM="${CHECKSUM} 6943949a6678589ebf1686ee7bad7ea1" NAME=p4est-${VERSION} +PACKING=.tar.gz EXTRACTSTO=p4est-${VERSION} SOURCE=https://p4est.github.io/release/ -PACKING=.tar.gz + BUILDCHAIN=custom INSTALL_PATH=${INSTALL_PATH}/${NAME} diff --git a/deal.II-toolchain/packages/superlu_dist.package b/deal.II-toolchain/packages/superlu_dist.package index 70d319c..6c26753 100644 --- a/deal.II-toolchain/packages/superlu_dist.package +++ b/deal.II-toolchain/packages/superlu_dist.package @@ -6,9 +6,9 @@ VERSION=5.1.2 CHECKSUM=0a99bbb5f6c26a9c1d7ab17ea35d4e6f NAME=superlu_dist_${VERSION} +PACKING=.tar.gz EXTRACTSTO=SuperLU_DIST_${VERSION} SOURCE=http://crd-legacy.lbl.gov/~xiaoye/SuperLU/ -PACKING=.tar.gz BUILDCHAIN=cmake diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package index 1934e40..0c20895 100644 --- a/deal.II-toolchain/packages/trilinos.package +++ b/deal.II-toolchain/packages/trilinos.package @@ -91,7 +91,7 @@ if [ ! -z "${LAPACK_DIR}" ]; then fi # Set intel MKL options -if [ "${MKL}" = "ON" ]; then +if [ ${MKL} = ON ]; then cecho ${INFO} "trilinos: configuration with MKL" if [ -z "${BLAS_DIR}" ] && [ -z "${LAPACK_DIR}" ]; then diff --git a/deal.II-toolchain/platforms/deprecated/fedora22.platform b/deal.II-toolchain/platforms/deprecated/fedora22.platform deleted file mode 100644 index 290e917..0000000 --- a/deal.II-toolchain/platforms/deprecated/fedora22.platform +++ /dev/null @@ -1,22 +0,0 @@ -# Fedora 22 - -# This build script assumes that you have several packages already -# installed via Fedora's dnf using the following command: -# -# $ sudo dnf install \ -# @development-tools gcc-c++ cmake openmpi openmpi-devel splint \ -# patch libtool lua lua-devel \ -# blas blas-devel lapack lapack-devel \ -# doxygen graphviz graphviz-devel qt-devel \ -# metis metis-devel -# -# Please load the 'openmpi' compiler with -# $ module load mpi/openmpi-x86_64 -# and then set the compiler enviroment variables to -# $ export CC=mpicc; export CXX=mpicxx; export FC=mpif90; export FF=mpif77 -# before you continue! -## - -# -# Define the additional packages for this platform. -#PACKAGES="once:cmake ${PACKAGES}" diff --git a/deal.II-toolchain/platforms/deprecated/fedora23.platform b/deal.II-toolchain/platforms/deprecated/fedora23.platform deleted file mode 100644 index 844000a..0000000 --- a/deal.II-toolchain/platforms/deprecated/fedora23.platform +++ /dev/null @@ -1,22 +0,0 @@ -# Fedora 23 - -# This build script assumes that you have several packages already -# installed via Fedora's dnf using the following command: -# -# $ sudo dnf install \ -# @development-tools gcc-c++ cmake openmpi openmpi-devel splint \ -# patch libtool lua lua-devel \ -# blas blas-devel lapack lapack-devel \ -# doxygen graphviz graphviz-devel qt-devel \ -# metis metis-devel -# -# Please load the 'openmpi' compiler with -# $ module load mpi/openmpi-x86_64 -# and then set the compiler enviroment variables to -# $ export CC=mpicc; export CXX=mpicxx; export FC=mpif90; export FF=mpif77 -# before you continue! -## - -# -# Define the additional packages for this platform. -#PACKAGES="once:cmake ${PACKAGES}" diff --git a/deal.II-toolchain/platforms/supported/mojave.platform b/deal.II-toolchain/platforms/supported/macos_mojave.platform similarity index 100% rename from deal.II-toolchain/platforms/supported/mojave.platform rename to deal.II-toolchain/platforms/supported/macos_mojave.platform -- 2.39.5