From 11bac1b32985eaae89422d1ef378ed6ebd4591de Mon Sep 17 00:00:00 2001 From: Bernhard Gschaider Date: Wed, 4 Jun 2014 18:03:42 +0200 Subject: [PATCH] Make the OpenSUSE 13.1 box compile out of the box --- vagrantSandbox/initOpenSUSEScript.sh | 2 +- vagrantSandbox/skel/bootstrapFoam.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/vagrantSandbox/initOpenSUSEScript.sh b/vagrantSandbox/initOpenSUSEScript.sh index 89d5fb7b8..48bcc0cff 100755 --- a/vagrantSandbox/initOpenSUSEScript.sh +++ b/vagrantSandbox/initOpenSUSEScript.sh @@ -11,7 +11,7 @@ zypper -n remove patterns-openSUSE-minimal_base-conflicts # patterns-openSUSE-devel_python -neededPackages=(gcc-c++ mercurial git flex bison make ccache zlib-devel rpm-build binutils-devel) +neededPackages=(gcc-c++ mercurial git flex bison make ccache zlib-devel rpm-build binutils-devel cmake) bonusPackages=(emacs csh tcsh zsh) for p in ${neededPackages[@]}; do diff --git a/vagrantSandbox/skel/bootstrapFoam.sh b/vagrantSandbox/skel/bootstrapFoam.sh index ce3aaf55f..b85238396 100755 --- a/vagrantSandbox/skel/bootstrapFoam.sh +++ b/vagrantSandbox/skel/bootstrapFoam.sh @@ -15,6 +15,12 @@ cd $WM_THIRD_PARTY_DIR ./AllMake.stage0 2>&1 | tee $BOOTSTRAPLOG ./AllMake.stage1 2>&1 | tee --append $BOOTSTRAPLOG ./AllMake.stage2 2>&1 | tee --append $BOOTSTRAPLOG +source $WM_PROJECT_DIR/etc/bashrc +if [ ! -e $MPI_ARCH_PATH/lib ] +then + # OpenSUSE needs this + ln -s $MPI_ARCH_PATH/lib64 $MPI_ARCH_PATH/lib +fi ./AllMake.stage3 2>&1 | tee --append $BOOTSTRAPLOG cd $WM_PROJECT_DIR