From 016629252d468ed66e02b2e0165abde07f237613 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Mon, 8 Jun 2020 19:18:01 -0400 Subject: [PATCH] a few more tweaks needed for centos8 and fedora32 --- tools/singularity/centos8.def | 2 +- tools/singularity/fedora32_mingw.def | 22 ++++------------------ 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/tools/singularity/centos8.def b/tools/singularity/centos8.def index f64df09d1f..d2eba155ec 100644 --- a/tools/singularity/centos8.def +++ b/tools/singularity/centos8.def @@ -49,7 +49,7 @@ From: centos:8 make make install # fix up installation for CentOS and Fedora - mv -v /usr/lib/pkgconfig/plumed* /usr/share/pkgconfig/ + mv -v /usr/lib64/pkgconfig/plumed* /usr/share/pkgconfig/ cd ../../ rm -rvf plumed diff --git a/tools/singularity/fedora32_mingw.def b/tools/singularity/fedora32_mingw.def index 79dca4dd23..6eb1944ec2 100644 --- a/tools/singularity/fedora32_mingw.def +++ b/tools/singularity/fedora32_mingw.def @@ -38,23 +38,9 @@ From: fedora:32 blas-devel lapack-devel libyaml-devel openkim-models kim-api-devel dnf clean all - # we need to reset any module variables - # inherited from the host. - unset __LMOD_REF_COUNT__LMFILES_ - unset __LMOD_REF_COUNT_PATH - unset __LMOD_REF_COUNT_LD_LIBRARY_PATH - unset __LMOD_REF_COUNT_MANPATH - unset __LMOD_REF_COUNT_MODULEPATH - unset __LMOD_REF_COUNT_LOADEDMODULES - unset _LMFILES_ - unset MODULEPATH - unset MODULESHOME - unset MODULEPATH_ROOT - unset LOADEDMODULES - unset LMOD_SYSTEM_DEFAULT_MODULES - - # load MPI by default - . /etc/profile + # enable Lmod and load MPI + source /usr/share/lmod/lmod/init/profile + module purge module load mpi # manually install Plumed @@ -68,7 +54,7 @@ From: fedora:32 make make install # fix up installation for CentOS and Fedora - mv -v /usr/lib/pkgconfig/plumed* /usr/share/pkgconfig/ + mv -v /usr/lib64/pkgconfig/plumed* /usr/share/pkgconfig/ cd ../../ rm -rvf plumed