From f6d571d7eeb75af28e530e182482c09cf16e8705 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 17 Jul 2014 15:34:11 +0200 Subject: [PATCH 1/2] BoxLib: added; boost: explicit disable MPI --- config/versions.conf | 1 + scripts/BoxLib.build | 17 +++++++++++++++++ scripts/boost.build | 2 ++ 3 files changed, 20 insertions(+) create mode 100755 scripts/BoxLib.build diff --git a/config/versions.conf b/config/versions.conf index a050924..1ab2d13 100644 --- a/config/versions.conf +++ b/config/versions.conf @@ -1,6 +1,7 @@ autoconf 2.69 automake 1.14 boost 1.55.0 +BoxLib 2014-02-28 cmake 2.8.12.2 emacs 24.3 filebench 1.4.9.1 diff --git a/scripts/BoxLib.build b/scripts/BoxLib.build new file mode 100755 index 0000000..1ccba01 --- /dev/null +++ b/scripts/BoxLib.build @@ -0,0 +1,17 @@ +#!/bin/bash + +source "$(dirname $0)/../lib/libem.bash" + +function em.configure() { + CC=$MPICC CXX=$MPICXX cmake \ + -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ + -DCMAKE_BUILD_TYPE=RELEASE \ + "${EM_SRCDIR}" +} + +em.add_to_family 'MPI' +em.set_runtime_dependencies "${COMPILER}" "${MPI}" +em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" +em.make_all + + diff --git a/scripts/boost.build b/scripts/boost.build index dd152b5..4279fcd 100755 --- a/scripts/boost.build +++ b/scripts/boost.build @@ -21,6 +21,7 @@ function em.build() { --build-type=minimal \ --build-dir="${EM_BUILDDIR}" \ --layout=system \ + --without-mpi \ variant=release \ link=static \ threading=multi \ @@ -33,6 +34,7 @@ function em.install() { --build-type=minimal \ --build-dir="${EM_BUILDDIR}" \ --layout=system \ + --without-mpi \ variant=release \ link=static \ threading=multi \ From 2b3b96ae8ade4a6478621cd144d2e09493662068 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 17 Jul 2014 15:52:43 +0200 Subject: [PATCH 2/2] Boxlib: doc-files added --- scripts/BoxLib.build | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/BoxLib.build b/scripts/BoxLib.build index 1ccba01..3a6a6de 100755 --- a/scripts/BoxLib.build +++ b/scripts/BoxLib.build @@ -12,6 +12,7 @@ function em.configure() { em.add_to_family 'MPI' em.set_runtime_dependencies "${COMPILER}" "${MPI}" em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" +em.set_docfiles 'license.txt' 'README.txt' em.make_all