From 5ad73a9cb770486be7cc30cbf97e850de58df688 Mon Sep 17 00:00:00 2001 From: easybuild Date: Thu, 23 Mar 2017 09:23:17 +0100 Subject: [PATCH] # new file: g/GLib/GLib-2.40.0.eb # new file: l/libffi/libffi-3.0.13.eb # deleted: o/OpenFOAM/OpenFOAM-4.1-cleanup.patch # deleted: o/OpenFOAM/cleanup-OpenFOAM-2.2.2.patch --- g/GLib/GLib-2.40.0.eb | 22 ++ l/libffi/libffi-3.0.13.eb | 25 ++ o/OpenFOAM/OpenFOAM-4.1-cleanup.patch | 291 ------------------------ o/OpenFOAM/cleanup-OpenFOAM-2.2.2.patch | 237 ------------------- 4 files changed, 47 insertions(+), 528 deletions(-) create mode 100644 g/GLib/GLib-2.40.0.eb create mode 100644 l/libffi/libffi-3.0.13.eb delete mode 100644 o/OpenFOAM/OpenFOAM-4.1-cleanup.patch delete mode 100644 o/OpenFOAM/cleanup-OpenFOAM-2.2.2.patch diff --git a/g/GLib/GLib-2.40.0.eb b/g/GLib/GLib-2.40.0.eb new file mode 100644 index 00000000..83c29391 --- /dev/null +++ b/g/GLib/GLib-2.40.0.eb @@ -0,0 +1,22 @@ +# Built with EasyBuild version 2.1.1 on 2015-07-07_13-08-51 +easyblock = 'ConfigureMake' + +name = 'GLib' +version = '2.40.0' + +homepage = 'http://www.gtk.org/' +description = """GLib is one of the base libraries of the GTK+ project""" + +toolchain = {'name': 'dummy', 'version': ''} +toolchainopts = {'optarch': True, 'pic': True} + +source_urls = ['http://ftp.gnome.org/pub/gnome/sources/glib/%(version_major_minor)s/'] +sources = ['glib-%(version)s.tar.xz'] + +dependencies = [ + ('libffi', '3.0.13'), + ('gettext', '0.19.2'), +] +builddependencies = [('Python', '2.7.9')] + +moduleclass = 'vis' diff --git a/l/libffi/libffi-3.0.13.eb b/l/libffi/libffi-3.0.13.eb new file mode 100644 index 00000000..b076bc22 --- /dev/null +++ b/l/libffi/libffi-3.0.13.eb @@ -0,0 +1,25 @@ +easyblock = 'ConfigureMake' + +name = 'libffi' +version = '3.0.13' + +homepage = 'http://sourceware.org/libffi/' +description = """The libffi library provides a portable, high level programming interface to various calling +conventions. This allows a programmer to call any function specified by a call interface description at run-time.""" + +toolchain = {'name': 'dummy', 'version': ''} + +source_urls = [ + 'ftp://sourceware.org/pub/libffi/', + 'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/', +] +sources = [SOURCELOWER_TAR_GZ] + +patches = ['libffi-%(version)s_include-xmmintrin.patch'] + +sanity_check_paths = { + 'files': [], + 'dirs': ['lib'], +} + +moduleclass = 'lib' diff --git a/o/OpenFOAM/OpenFOAM-4.1-cleanup.patch b/o/OpenFOAM/OpenFOAM-4.1-cleanup.patch deleted file mode 100644 index 76297bd6..00000000 --- a/o/OpenFOAM/OpenFOAM-4.1-cleanup.patch +++ /dev/null @@ -1,291 +0,0 @@ -# This patch removes all need for the ThirdParty files of OpenFOAM: -# we use EB dependencies for everything. It adjusts the paths, variables, etc -# We also let the install dir, compiler, etc be set by EB. -# Lastly, we also fix a small compile issue in 'ptscotchDecomp.C' -# Ward Poelmans -diff -ur OpenFOAM-4.1.orig/applications/utilities/mesh/manipulation/setSet/Allwmake OpenFOAM-4.1/applications/utilities/mesh/manipulation/setSet/Allwmake ---- OpenFOAM-4.1.orig/applications/utilities/mesh/manipulation/setSet/Allwmake 2016-06-24 23:33:52.000000000 +0200 -+++ OpenFOAM-4.1/applications/utilities/mesh/manipulation/setSet/Allwmake 2016-09-02 15:44:36.305512075 +0200 -@@ -9,11 +9,11 @@ - # - # use readline if available - # --if [ -f /usr/include/readline/readline.h ] -+if [ -f $EBROOTLIBREADLINE/include/readline/readline.h ] - then - echo "Found -- enabling readline support." - export COMP_FLAGS="-DHAS_READLINE" -- export LINK_FLAGS="-lreadline" -+ export LINK_FLAGS="-L$EBROOTLIBREADLINE/lib -lreadline -L$EBROOTNCURSES -lncurses" - fi - - wmake -diff -ur OpenFOAM-4.1.orig/applications/utilities/postProcessing/graphics/PVReaders/Allwmake OpenFOAM-4.1/applications/utilities/postProcessing/graphics/PVReaders/Allwmake ---- OpenFOAM-4.1.orig/applications/utilities/postProcessing/graphics/PVReaders/Allwmake 2016-06-24 23:33:52.000000000 +0200 -+++ OpenFOAM-4.1/applications/utilities/postProcessing/graphics/PVReaders/Allwmake 2016-09-02 15:44:36.305512075 +0200 -@@ -16,7 +16,7 @@ - } - - # ensure CMake gets the correct C++ compiler -- [ -n "$WM_CXX" ] && export CXX="$WM_CXX" -+# [ -n "$WM_CXX" ] && export CXX="$WM_CXX" - - wmake $targetType vtkPVReaders - PVblockMeshReader/Allwmake $* -diff -ur OpenFOAM-4.1.orig/etc/bashrc OpenFOAM-4.1/etc/bashrc ---- OpenFOAM-4.1.orig/etc/bashrc 2016-06-24 23:33:52.000000000 +0200 -+++ OpenFOAM-4.1/etc/bashrc 2016-09-02 15:43:37.773220097 +0200 -@@ -42,9 +42,8 @@ - # - # Please set to the appropriate path if the default is not correct. - # --[ $BASH_SOURCE ] && \ --export FOAM_INST_DIR=${BASH_SOURCE%/*/*/*} || \ --export FOAM_INST_DIR=$HOME/$WM_PROJECT -+# For Easybuild: set by the module -+# - # export FOAM_INST_DIR=~$WM_PROJECT - # export FOAM_INST_DIR=/opt/$WM_PROJECT - # export FOAM_INST_DIR=/usr/local/$WM_PROJECT -diff -ur OpenFOAM-4.1.orig/etc/config.sh/CGAL OpenFOAM-4.1/etc/config.sh/CGAL ---- OpenFOAM-4.1.orig/etc/config.sh/CGAL 2016-06-24 23:33:52.000000000 +0200 -+++ OpenFOAM-4.1/etc/config.sh/CGAL 2016-09-02 15:43:37.773220097 +0200 -@@ -36,37 +36,7 @@ - # - #------------------------------------------------------------------------------ - --boost_version=boost-system --cgal_version=cgal-system --#cgal_version=CGAL-4.8 -- --if [ -z "$SOURCE_CGAL_VERSIONS_ONLY" ] --then -- -- common_path=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER -- -- export BOOST_ARCH_PATH=$common_path/$boost_version -- export CGAL_ARCH_PATH=$common_path/$cgal_version -- -- if [ "$FOAM_VERBOSE" -a "$PS1" ] -- then -- echo "Using CGAL and boost" 1>&2 -- echo " $cgal_version at $CGAL_ARCH_PATH" 1>&2 -- echo " $boost_version at $BOOST_ARCH_PATH" 1>&2 -- fi -- -- if [ -d "$CGAL_ARCH_PATH" -a "$cgal_version" != "cgal-system" ] -- then -- _foamAddLib $CGAL_ARCH_PATH/lib -- fi -- -- if [ -d "$BOOST_ARCH_PATH" -a "$boost_version" != "boost-system" ] -- then -- _foamAddLib $BOOST_ARCH_PATH/lib -- fi -- -- unset boost_version cgal_version common_path -- --fi -+export CGAL_ARCH_PATH=$EBROOTCGAL -+export BOOST_ARCH_PATH=$EBROOTBOOST - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.1.orig/etc/config.sh/gperftools OpenFOAM-4.1/etc/config.sh/gperftools ---- OpenFOAM-4.1.orig/etc/config.sh/gperftools 2016-06-24 23:33:52.000000000 +0200 -+++ OpenFOAM-4.1/etc/config.sh/gperftools 2016-09-02 15:43:37.773220097 +0200 -@@ -29,13 +29,7 @@ - # - #------------------------------------------------------------------------------ - --version=svn --gperftools_install=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER -- --GPERFTOOLS_VERSION=gperftools-$version --GPERFTOOLS_ARCH_PATH=$gperftools_install/$GPERFTOOLS_VERSION -- --export PATH=$GPERFTOOLS_ARCH_PATH/bin:$PATH --export LD_LIBRARY_PATH=$GPERFTOOLS_ARCH_PATH/lib:$LD_LIBRARY_PATH -+GPERFTOOLS_VERSION=gperftools-$EBVERSIONGPERFTOOLS -+GPERFTOOLS_ARCH_PATH=$EBROOTGPERFTOOLS - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.1.orig/etc/config.sh/metis OpenFOAM-4.1/etc/config.sh/metis ---- OpenFOAM-4.1.orig/etc/config.sh/metis 2016-06-24 23:33:52.000000000 +0200 -+++ OpenFOAM-4.1/etc/config.sh/metis 2016-09-02 15:43:37.773220097 +0200 -@@ -34,7 +34,7 @@ - # - #------------------------------------------------------------------------------ - --export METIS_VERSION=metis-5.1.0 --export METIS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$METIS_VERSION -+export METIS_VERSION=metis-$EBVERSIONMETIS -+export METIS_ARCH_PATH=$EBROOTMETIS - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.1.orig/etc/config.sh/mpi OpenFOAM-4.1/etc/config.sh/mpi ---- OpenFOAM-4.1.orig/etc/config.sh/mpi 2016-06-24 23:33:52.000000000 +0200 -+++ OpenFOAM-4.1/etc/config.sh/mpi 2016-09-02 15:43:37.773220097 +0200 -@@ -243,6 +243,9 @@ - _foamAddPath $MPI_ARCH_PATH/bin64 - _foamAddLib $MPI_ARCH_PATH/lib64 - ;; -+EASYBUILDMPI) -+ export FOAM_MPI=mpi -+ ;; - *) - export FOAM_MPI=dummy - ;; -diff -ur OpenFOAM-4.1.orig/etc/config.sh/paraview OpenFOAM-4.1/etc/config.sh/paraview ---- OpenFOAM-4.1.orig/etc/config.sh/paraview 2016-06-24 23:33:52.000000000 +0200 -+++ OpenFOAM-4.1/etc/config.sh/paraview 2016-09-02 15:43:37.773220097 +0200 -@@ -41,21 +41,6 @@ - ) \ - && PATH="$cleaned" - --# Determine the cmake to be used --unset CMAKE_HOME --for cmake in cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 \ -- cmake-2.8.1 --do -- cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake -- if [ -r $cmake ] -- then -- export CMAKE_HOME=$cmake -- export CMAKE_ROOT=$cmake -- export PATH=$CMAKE_HOME/bin:$PATH -- break -- fi --done -- - - #- ParaView version, automatically determine major version - #export ParaView_VERSION=3.12.0 -@@ -64,7 +49,7 @@ - #export ParaView_VERSION=4.3.1 - #export ParaView_VERSION=4.4.0 - #export ParaView_VERSION=5.0.0 --export ParaView_VERSION=5.0.1 -+export ParaView_VERSION=$EBVERSIONPARAVIEW - export ParaView_MAJOR=detect - - -@@ -105,21 +90,15 @@ - paraviewInstDir=$WM_THIRD_PARTY_DIR/ParaView-$ParaView_VERSION - paraviewArchName=ParaView-$ParaView_VERSION - --export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName -+export ParaView_DIR=$EBROOTPARAVIEW - - # Set paths if binaries or source are present - if [ -r $ParaView_DIR -o -r $paraviewInstDir ] - then - export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-$ParaView_MAJOR -- if [ ! -d $ParaView_INCLUDE_DIR -a -d $ParaView_DIR/include/paraview-3.0 ] -- then -- export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-3.0 -- fi - - ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR - -- export PATH=$ParaView_DIR/bin:$PATH -- export LD_LIBRARY_PATH=$ParaView_LIB_DIR:$LD_LIBRARY_PATH - export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-$ParaView_MAJOR - - if [ "$FOAM_VERBOSE" -a "$PS1" ] -@@ -131,17 +110,6 @@ - echo " PV_PLUGIN_PATH : $PV_PLUGIN_PATH" - fi - -- # Add in python libraries if required -- paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping -- if [ -r $paraviewPython ] -- then -- if [ "$PYTHONPATH" ] -- then -- export PYTHONPATH=$PYTHONPATH:$paraviewPython:$ParaView_LIB_DIR -- else -- export PYTHONPATH=$paraviewPython:$ParaView_LIB_DIR -- fi -- fi - else - unset PV_PLUGIN_PATH - fi -diff -ur OpenFOAM-4.1.orig/etc/config.sh/scotch OpenFOAM-4.1/etc/config.sh/scotch ---- OpenFOAM-4.1.orig/etc/config.sh/scotch 2016-06-24 23:33:52.000000000 +0200 -+++ OpenFOAM-4.1/etc/config.sh/scotch 2016-09-02 15:43:37.773220097 +0200 -@@ -37,7 +37,7 @@ - # - #------------------------------------------------------------------------------ - --export SCOTCH_VERSION=scotch_6.0.3 --export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$SCOTCH_VERSION -+export SCOTCH_VERSION=scotch_$EBVERSIONSCOTCH -+export SCOTCH_ARCH_PATH=$EBROOTSCOTCH - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.1.orig/etc/config.sh/settings OpenFOAM-4.1/etc/config.sh/settings ---- OpenFOAM-4.1.orig/etc/config.sh/settings 2016-06-24 23:33:52.000000000 +0200 -+++ OpenFOAM-4.1/etc/config.sh/settings 2016-09-02 15:43:37.773220097 +0200 -@@ -56,11 +56,11 @@ - 64) - WM_ARCH=linux64 - export WM_COMPILER_LIB_ARCH=64 -- export WM_CC='gcc' -- export WM_CXX='g++' -- export WM_CFLAGS='-m64 -fPIC' -- export WM_CXXFLAGS='-m64 -fPIC -std=c++0x' -- export WM_LDFLAGS='-m64' -+ export WM_CC=$CC -+ export WM_CXX=$CXX -+ export WM_CFLAGS=$CFLAGS -+ export WM_CXXFLAGS=$CXXFLAGS -+ export WM_LDFLAGS=$LDFLAGS - ;; - *) - echo "Unknown WM_ARCH_OPTION '$WM_ARCH_OPTION', should be 32 or 64"\ -diff -ur OpenFOAM-4.1.orig/src/parallel/decompose/ptscotchDecomp/Make/options OpenFOAM-4.1/src/parallel/decompose/ptscotchDecomp/Make/options ---- OpenFOAM-4.1.orig/src/parallel/decompose/ptscotchDecomp/Make/options 2016-06-24 23:33:52.000000000 +0200 -+++ OpenFOAM-4.1/src/parallel/decompose/ptscotchDecomp/Make/options 2016-09-02 15:44:36.305512075 +0200 -@@ -3,10 +3,8 @@ - - EXE_INC = \ - $(PFLAGS) $(PINC) \ -- -I$(SCOTCH_ROOT)/include \ - -I$(SCOTCH_ARCH_PATH)/include/$(FOAM_MPI) \ -- -I/usr/include/scotch \ - -I../decompositionMethods/lnInclude - - LIB_LIBS = \ -- -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit -lscotch ${LINK_FLAGS} -lrt -+ -L$(SCOTCH_ARCH_PATH)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit -lscotch ${LINK_FLAGS} -lrt -diff -ur OpenFOAM-4.1.orig/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C OpenFOAM-4.1/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C ---- OpenFOAM-4.1.orig/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C 2016-06-24 23:33:52.000000000 +0200 -+++ OpenFOAM-4.1/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C 2016-09-02 15:45:13.376950242 +0200 -@@ -30,10 +30,11 @@ - #include "globalIndex.H" - #include "SubField.H" - -+#include -+ - extern "C" - { - #include -- #include - #include "ptscotch.h" - } - -diff -ur OpenFOAM-4.1.orig/src/parallel/decompose/scotchDecomp/Make/options OpenFOAM-4.1/src/parallel/decompose/scotchDecomp/Make/options ---- OpenFOAM-4.1.orig/src/parallel/decompose/scotchDecomp/Make/options 2016-06-24 23:33:52.000000000 +0200 -+++ OpenFOAM-4.1/src/parallel/decompose/scotchDecomp/Make/options 2016-09-02 15:44:36.305512075 +0200 -@@ -7,10 +7,8 @@ - - EXE_INC = \ - $(PFLAGS) $(PINC) \ -- -I$(SCOTCH_ROOT)/include \ - -I$(SCOTCH_ARCH_PATH)/include \ -- -I/usr/include/scotch \ - -I../decompositionMethods/lnInclude - - LIB_LIBS = \ -- -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt -+ -L$(SCOTCH_ARCH_PATH)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt diff --git a/o/OpenFOAM/cleanup-OpenFOAM-2.2.2.patch b/o/OpenFOAM/cleanup-OpenFOAM-2.2.2.patch deleted file mode 100644 index 14ebe59f..00000000 --- a/o/OpenFOAM/cleanup-OpenFOAM-2.2.2.patch +++ /dev/null @@ -1,237 +0,0 @@ -patch to avoid hardcoding of settings, so defaults can be set on the outside by defining environment variables -author: Kenneth Hoste (Ghent University) -diff -ru OpenFOAM-2.2.2.orig/etc/bashrc OpenFOAM-2.2.2/etc/bashrc ---- OpenFOAM-2.2.2.orig/etc/bashrc 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/etc/bashrc 2015-03-03 10:39:07.817538712 +0100 -@@ -63,7 +63,7 @@ - - #- Compiler: - # WM_COMPILER = Gcc | Gcc43 | Gcc44 | Gcc45 | Gcc46 | Clang | Icc (Intel icc) --export WM_COMPILER=Gcc -+: ${WM_COMPILER:=Gcc}; export WM_COMPILER - unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH - - #- Architecture: -@@ -81,7 +81,7 @@ - #- MPI implementation: - # WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI - # | GAMMA | MPI | QSMPI | SGIMPI --export WM_MPLIB=OPENMPI -+: ${WM_MPLIB:=OPENMPI}; export WM_MPLIB - - #- Operating System: - # WM_OSTYPE = POSIX | ??? -@@ -115,7 +115,7 @@ - - # Location of third-party software - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION -+: ${WM_THIRD_PARTY_DIR:=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION}; export WM_THIRD_PARTY_DIR - - # Location of site-specific templates etc - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -diff -ru OpenFOAM-2.2.2.orig/etc/config/scotch.sh OpenFOAM-2.2.2/etc/config/scotch.sh ---- OpenFOAM-2.2.2.orig/etc/config/scotch.sh 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/etc/config/scotch.sh 2015-03-03 10:39:07.817538712 +0100 -@@ -33,7 +33,11 @@ - # during the wmake process - #------------------------------------------------------------------------------ - --export SCOTCH_VERSION=scotch_6.0.0 --export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$SCOTCH_VERSION -+if [ -n "${SCOTCH_ROOT}" ] ; then -+ export SCOTCH_ARCH_PATH="${SCOTCH_ROOT}" -+else -+ export SCOTCH_VERSION=scotch_6.0.0 -+ export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$SCOTCH_VERSION -+fi - - # ----------------------------------------------------------------------------- -diff -ru OpenFOAM-2.2.2.orig/etc/config/settings.csh OpenFOAM-2.2.2/etc/config/settings.csh ---- OpenFOAM-2.2.2.orig/etc/config/settings.csh 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/etc/config/settings.csh 2015-03-03 10:39:07.817538712 +0100 -@@ -373,7 +373,7 @@ - # Communications library - # ~~~~~~~~~~~~~~~~~~~~~~ - --unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN -+#unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN - - switch ("$WM_MPLIB") - case SYSTEMOPENMPI: -diff -ru OpenFOAM-2.2.2.orig/etc/config/settings.sh OpenFOAM-2.2.2/etc/config/settings.sh ---- OpenFOAM-2.2.2.orig/etc/config/settings.sh 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/etc/config/settings.sh 2015-03-03 10:39:07.817538712 +0100 -@@ -395,7 +395,7 @@ - # Communications library - # ~~~~~~~~~~~~~~~~~~~~~~ - --unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN -+#unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN - - case "$WM_MPLIB" in - SYSTEMOPENMPI) -@@ -563,6 +563,11 @@ - _foamAddPath $MPI_ARCH_PATH/bin64 - _foamAddLib $MPI_ARCH_PATH/lib64 - ;; -+ -+EASYBUILDMPI) -+ export FOAM_MPI=mpi -+ ;; -+ - *) - export FOAM_MPI=dummy - ;; -diff -ru OpenFOAM-2.2.2.orig/src/parallel/decompose/ptscotchDecomp/lnInclude/ptscotchDecomp.C OpenFOAM-2.2.2/src/parallel/decompose/ptscotchDecomp/lnInclude/ptscotchDecomp.C ---- OpenFOAM-2.2.2.orig/src/parallel/decompose/ptscotchDecomp/lnInclude/ptscotchDecomp.C 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/src/parallel/decompose/ptscotchDecomp/lnInclude/ptscotchDecomp.C 2015-03-03 10:39:07.827538901 +0100 -@@ -112,6 +112,8 @@ - - \*---------------------------------------------------------------------------*/ - -+#include "mpi.h" -+ - #include "ptscotchDecomp.H" - #include "addToRunTimeSelectionTable.H" - #include "Time.H" -@@ -121,8 +123,8 @@ - - extern "C" - { --#include - #include "mpi.h" -+#include - #include "ptscotch.h" - } - -diff -ru OpenFOAM-2.2.2.orig/src/parallel/decompose/ptscotchDecomp/Make/options OpenFOAM-2.2.2/src/parallel/decompose/ptscotchDecomp/Make/options ---- OpenFOAM-2.2.2.orig/src/parallel/decompose/ptscotchDecomp/Make/options 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/src/parallel/decompose/ptscotchDecomp/Make/options 2015-03-03 10:39:07.827538901 +0100 -@@ -3,10 +3,8 @@ - - EXE_INC = \ - $(PFLAGS) $(PINC) \ -- -I$(SCOTCH_ROOT)/include \ - -I$(SCOTCH_ARCH_PATH)/include/$(FOAM_MPI) \ -- -I/usr/include/scotch \ - -I../decompositionMethods/lnInclude - - LIB_LIBS = \ -- -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit ${LINK_FLAGS} -lrt -+ -L$(SCOTCH_ARCH_PATH)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit ${LINK_FLAGS} -lrt -diff -ru OpenFOAM-2.2.2.orig/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C OpenFOAM-2.2.2/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C ---- OpenFOAM-2.2.2.orig/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C 2015-03-03 10:39:07.827538901 +0100 -@@ -112,6 +112,8 @@ - - \*---------------------------------------------------------------------------*/ - -+#include "mpi.h" -+ - #include "ptscotchDecomp.H" - #include "addToRunTimeSelectionTable.H" - #include "Time.H" -@@ -121,8 +123,8 @@ - - extern "C" - { --#include - #include "mpi.h" -+#include - #include "ptscotch.h" - } - -diff -ru OpenFOAM-2.2.2.orig/src/parallel/decompose/scotchDecomp/Make/options OpenFOAM-2.2.2/src/parallel/decompose/scotchDecomp/Make/options ---- OpenFOAM-2.2.2.orig/src/parallel/decompose/scotchDecomp/Make/options 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/src/parallel/decompose/scotchDecomp/Make/options 2015-03-03 10:39:07.827538901 +0100 -@@ -7,10 +7,8 @@ - - EXE_INC = \ - $(PFLAGS) $(PINC) \ -- -I$(SCOTCH_ROOT)/include \ - -I$(SCOTCH_ARCH_PATH)/include \ -- -I/usr/include/scotch \ - -I../decompositionMethods/lnInclude - - LIB_LIBS = \ -- -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt -+ -L$(SCOTCH_ARCH_PATH)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt -diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/c OpenFOAM-2.2.2/wmake/rules/linux64Gcc/c ---- OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/c 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/wmake/rules/linux64Gcc/c 2015-03-03 10:39:07.827538901 +0100 -@@ -2,7 +2,7 @@ - - cWARN = -Wall - --cc = gcc -m64 -+cc = $(MPICC) - - include $(RULES)/c$(WM_COMPILE_OPTION) - -diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/c++ OpenFOAM-2.2.2/wmake/rules/linux64Gcc/c++ ---- OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/c++ 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/wmake/rules/linux64Gcc/c++ 2015-03-03 10:39:07.827538901 +0100 -@@ -2,7 +2,7 @@ - - c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor - --CC = g++ -m64 -+CC = $(MPICXX) - - include $(RULES)/c++$(WM_COMPILE_OPTION) - -diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/cOpt OpenFOAM-2.2.2/wmake/rules/linux64Gcc/cOpt ---- OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/cOpt 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/wmake/rules/linux64Gcc/cOpt 2015-03-03 10:39:07.827538901 +0100 -@@ -1,3 +1,3 @@ - cDBUG = --cOPT = -O3 -+cOPT = $(CFLAGS) - # -fprefetch-loop-arrays -diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/c++Opt OpenFOAM-2.2.2/wmake/rules/linux64Gcc/c++Opt ---- OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/c++Opt 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/wmake/rules/linux64Gcc/c++Opt 2015-03-03 10:39:07.827538901 +0100 -@@ -1,3 +1,3 @@ - c++DBUG = --c++OPT = -O3 -+c++OPT = $(CXXFLAGS) - # -fprefetch-loop-arrays -diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/c OpenFOAM-2.2.2/wmake/rules/linux64Icc/c ---- OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/c 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/wmake/rules/linux64Icc/c 2015-03-03 10:39:07.827538901 +0100 -@@ -2,7 +2,7 @@ - - cWARN = - --cc = icc -+cc = $(MPICC) - - include $(RULES)/c$(WM_COMPILE_OPTION) - -diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/c++ OpenFOAM-2.2.2/wmake/rules/linux64Icc/c++ ---- OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/c++ 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/wmake/rules/linux64Icc/c++ 2015-03-03 10:39:07.827538901 +0100 -@@ -2,7 +2,7 @@ - - c++WARN = -wd327,654,819,1125,1476,1505,1572 - --CC = icpc -std=c++0x -+CC = $(MPICXX) - - include $(RULES)/c++$(WM_COMPILE_OPTION) - -diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/cOpt OpenFOAM-2.2.2/wmake/rules/linux64Icc/cOpt ---- OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/cOpt 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/wmake/rules/linux64Icc/cOpt 2015-03-03 10:39:07.827538901 +0100 -@@ -1,2 +1,2 @@ - cDBUG = --cOPT = -O3 -no-prec-div -+cOPT = $(CFLAGS) -diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/c++Opt OpenFOAM-2.2.2/wmake/rules/linux64Icc/c++Opt ---- OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/c++Opt 2013-10-03 12:28:16.000000000 +0200 -+++ OpenFOAM-2.2.2/wmake/rules/linux64Icc/c++Opt 2015-03-03 10:39:45.158231466 +0100 -@@ -1,2 +1,2 @@ - c++DBUG = --c++OPT = -xHost -O2 -no-prec-div -+c++OPT = $(CXXFLAGS)