From 383f88d20f7f1fdc98770f3c029fa6590bfbcde5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Tue, 29 Jun 2021 10:47:45 +0200 Subject: [PATCH] platform fedora: update --- README.md | 2 +- candi.sh | 2 +- .../{fedora26.platform => fedora.platform} | 11 ++++----- .../platforms/supported/fedora27.platform | 23 ------------------- .../platforms/supported/fedora28.platform | 23 ------------------- .../platforms/supported/fedora29.platform | 23 ------------------- 6 files changed, 7 insertions(+), 77 deletions(-) rename deal.II-toolchain/platforms/supported/{fedora26.platform => fedora.platform} (74%) delete mode 100644 deal.II-toolchain/platforms/supported/fedora27.platform delete mode 100644 deal.II-toolchain/platforms/supported/fedora28.platform delete mode 100644 deal.II-toolchain/platforms/supported/fedora29.platform diff --git a/README.md b/README.md index 969cb57..7c41d7f 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Follow the instructions on the screen ### Examples -#### Install deal.II on RHEL 7, CentOS 7 or Fedora 26, 27, 28: +#### Install deal.II on RHEL 7, CentOS 7 or Fedora: ```bash module load mpi/openmpi-`uname -i` ./candi.sh diff --git a/candi.sh b/candi.sh index 7658a24..f1350e3 100755 --- a/candi.sh +++ b/candi.sh @@ -619,7 +619,7 @@ guess_platform() { local OS_PRETTY_NAME=$(grep -oP '(?<=^PRETTY_NAME=).+' /etc/os-release | tr -d '"') if [ "$OS_ID" == "fedora" ]; then - echo fedora${OS_VERSIONID} + echo fedora elif [ "$OS_ID" == "centos" ]; then echo centos${OS_VERSIONID} diff --git a/deal.II-toolchain/platforms/supported/fedora26.platform b/deal.II-toolchain/platforms/supported/fedora.platform similarity index 74% rename from deal.II-toolchain/platforms/supported/fedora26.platform rename to deal.II-toolchain/platforms/supported/fedora.platform index aea6a6f..7960dc3 100644 --- a/deal.II-toolchain/platforms/supported/fedora26.platform +++ b/deal.II-toolchain/platforms/supported/fedora.platform @@ -1,14 +1,14 @@ -# Fedora 26 +# Fedora # 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 \ +# @development-tools gcc-c++ cmake patch libtool lua lua-devel \ +# doxygen graphviz graphviz-devel \ # blas blas-devel lapack lapack-devel \ -# doxygen graphviz graphviz-devel qt-devel \ -# metis metis-devel +# openmpi openmpi-devel \ +# metis metis-devel # # Please load the 'openmpi' compiler with # $ module load mpi/openmpi-x86_64 @@ -20,4 +20,3 @@ # # Define the additional packages for this platform. #PACKAGES="once:cmake ${PACKAGES}" - diff --git a/deal.II-toolchain/platforms/supported/fedora27.platform b/deal.II-toolchain/platforms/supported/fedora27.platform deleted file mode 100644 index e141d8f..0000000 --- a/deal.II-toolchain/platforms/supported/fedora27.platform +++ /dev/null @@ -1,23 +0,0 @@ -# Fedora 27 - -# 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/fedora28.platform b/deal.II-toolchain/platforms/supported/fedora28.platform deleted file mode 100644 index 81e51f4..0000000 --- a/deal.II-toolchain/platforms/supported/fedora28.platform +++ /dev/null @@ -1,23 +0,0 @@ -# Fedora 28 - -# 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/fedora29.platform b/deal.II-toolchain/platforms/supported/fedora29.platform deleted file mode 100644 index 8720ab3..0000000 --- a/deal.II-toolchain/platforms/supported/fedora29.platform +++ /dev/null @@ -1,23 +0,0 @@ -# Fedora 29 - -# 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}" - -- 2.39.5