From 867088dbd8f48821b3ef76c940e97a5e8d0dffdb Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Tue, 28 Apr 2020 01:12:31 -0400 Subject: [PATCH] add packages to also allow a regular build not just cross-compilation --- tools/singularity/fedora30_mingw.def | 10 ++++++---- tools/singularity/fedora32_mingw.def | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/singularity/fedora30_mingw.def b/tools/singularity/fedora30_mingw.def index ef83d8f0a7..ab9ea7b738 100644 --- a/tools/singularity/fedora30_mingw.def +++ b/tools/singularity/fedora30_mingw.def @@ -3,9 +3,11 @@ From: fedora:30 %post dnf -y update - dnf -y install vim-enhanced git file make cmake patch which file \ - dos2unix findutils rsync \ - ccache gcc-c++ gdb valgrind eigen3-devel \ + dnf -y install vim-enhanced git file make cmake patch which file Lmod \ + ninja-build clang libomp-devel libubsan libasan libtsan \ + dos2unix findutils rsync python-devel libjpeg-devel libpng-devel \ + ccache gcc-c++ gcc-gfortran gdb valgrind eigen3-devel openblas-devel \ + openmpi-devel mpich-devel fftw-devel voro++-devel gsl-devel \ mingw-filesystem-base mingw32-nsis mingw-binutils-generic \ mingw32-filesystem mingw32-pkg-config \ mingw64-filesystem mingw64-pkg-config \ @@ -39,7 +41,7 @@ From: fedora:30 # we need to reset any module variables # inherited from the host. unset LOADEDMODULES - source /etc/profile.d/modules.sh + . /etc/profile.d/modules.sh module purge module load mpi diff --git a/tools/singularity/fedora32_mingw.def b/tools/singularity/fedora32_mingw.def index 43d5659a19..3f4ded6298 100644 --- a/tools/singularity/fedora32_mingw.def +++ b/tools/singularity/fedora32_mingw.def @@ -38,6 +38,8 @@ From: fedora:32 %environment LC_ALL=C export LC_ALL + # we need to reset any module variables + # inherited from the host. unset LOADEDMODULES . /etc/profile.d/modules.sh module purge