From d6a0122155f97a9f5eaabb5fa299ecf4f76dbd25 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 25 Jan 2018 10:07:05 +0100 Subject: [PATCH 1/5] Libraries/tiff: - module for version 4.0.9 --- Libraries/tiff/4/variants | 1 + Libraries/tiff/build | 2 ++ Libraries/tiff/modulefile | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Libraries/tiff/4/variants b/Libraries/tiff/4/variants index ea60f69..3ab9fef 100644 --- a/Libraries/tiff/4/variants +++ b/Libraries/tiff/4/variants @@ -1 +1,2 @@ tiff/4.0.3 stable +tiff/4.0.9 stable diff --git a/Libraries/tiff/build b/Libraries/tiff/build index 6035cb4..737918f 100755 --- a/Libraries/tiff/build +++ b/Libraries/tiff/build @@ -1,5 +1,7 @@ #!/usr/bin/env modbuild +SOURCE_URL="ftp://download.osgeo.org/libtiff/$P-$V.tar.gz" + pbuild::configure() { "${MODULE_SRCDIR}"/configure \ --prefix="${PREFIX}" \ diff --git a/Libraries/tiff/modulefile b/Libraries/tiff/modulefile index b547c01..edd8f57 100644 --- a/Libraries/tiff/modulefile +++ b/Libraries/tiff/modulefile @@ -1,7 +1,7 @@ #%Module1.0 module-whatis "set of C functions that support the manipulation of TIFF image files." -module-url "http://www.remotesensing.org/libtiff/" +module-url "http://www.simplesystems.org/libtiff/" module-license "BSD-like, see: http://libtiff.org/misc.html" module-maintainer "Achim Gsell " From aa50f54897f9803b0a67d28570ecf5d82f39ec59 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 25 Jan 2018 10:08:24 +0100 Subject: [PATCH 2/5] MPI/trilinos: - use system BLAS on macOS --- MPI/trilinos/build | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/MPI/trilinos/build b/MPI/trilinos/build index 6e54a24..482d5bd 100755 --- a/MPI/trilinos/build +++ b/MPI/trilinos/build @@ -4,32 +4,42 @@ SOURCE_URL="http://trilinos.csbsju.edu/download/files/trilinos-$V-Source.tar.bz2 declare -rx AR=ar -pbuild::configure() { +declare config_args=() +if [[ "${OS}" == "Linux" ]]; then BLAS_PREFIX=$OPENBLAS_PREFIX + BLAS_INCLUDE_DIRS="$BLAS_PREFIX/include" + BLAS_LIBRARY_DIRS="$BLAS_PREFIX/lib" + BLAS_LIBRARY_NAMES="openblas" LAPACK_PREFIX=$OPENBLAS_PREFIX + LAPACK_INCLUDE_DIRS="$LAPACK_PREFIX/include" + LAPACK_LIBRARY_DIRS="$LAPACK_PREFIX/lib" + LAPACK_LIBRARY_NAMES="openblas" + config_args+=( "-D BLAS_LIBRARY_DIRS:PATH=${BLAS_LIBRARY_DIRS}" ) + config_args+=( "-D BLAS_INCLUDE_DIRS:PATH=${BLAS_LIBRARY_DIRS}" ) + config_args+=( "-D BLAS_LIBRARY_NAMES:STRING=${BLAS_LIBRARY_NAMES}" ) + config_args+=( "-D LAPACK_LIBRARY_DIRS:PATH=${LAPACK_LIBRARY_DIRS}" ) + config_args+=( "-D LAPACK_INCLUDE_DIRS:PATH=${LAPACK_INCLUDE_DIRS}" ) + config_args+=( "-D LAPACK_LIBRARY_NAMES:STRING=${LAPACK_LIBRARY_NAMES}" ) +fi + +pbuild::configure() { + PARMETIS_INCLUDE_DIRS=$PARMETIS_PREFIX/include PARMETIS_LIBRARIES=$PARMETIS_PREFIX/lib/libparmetis.a METIS_INCLUDE_DIRS=$PARMETIS_PREFIX/include/metis METIS_LIBRARIES=$PARMETIS_PREFIX/lib/libmetis.a - BLAS_INCLUDE_DIRS="$BLAS_PREFIX/include" - BLAS_LIBRARY_DIRS="$BLAS_PREFIX/lib" - BLAS_LIBRARY_NAMES="openblas" - - LAPACK_INCLUDE_DIRS="$LAPACK_PREFIX/include" - LAPACK_LIBRARY_DIRS="$LAPACK_PREFIX/lib" - LAPACK_LIBRARY_NAMES="openblas" cmake \ + -D CMAKE_BUILD_TYPE:STRING=Release \ --prefix=$PREFIX \ -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \ -DCMAKE_CXX_FLAGS:STRING="-DMPICH_IGNORE_CXX_SEEK -fPIC" \ -DCMAKE_C_FLAGS:STRING="-DMPICH_IGNORE_CXX_SEEK -fPIC" \ -D CMAKE_CXX_STANDARD:STRING="11" \ -DCMAKE_Fortran_FLAGS:STRING="-fPIC" \ - -D CMAKE_BUILD_TYPE:STRING=DEBUG \ -D TPL_ENABLE_DLlib:BOOL=OFF \ -D TPL_ENABLE_QT:BOOL=OFF \ -D TPL_ENABLE_MPI:BOOL=ON \ @@ -37,12 +47,6 @@ pbuild::configure() { -D TPL_ENABLE_LAPACK:BOOL=ON \ -D TPL_ENABLE_METIS:BOOL=ON \ -D TPL_ENABLE_ParMETIS:BOOL=ON \ - -D BLAS_LIBRARY_DIRS:PATH="$BLAS_LIBRARY_DIRS" \ - -D BLAS_INCLUDE_DIRS:PATH="$BLAS_LIBRARY_DIRS" \ - -D BLAS_LIBRARY_NAMES:STRING="$BLAS_LIBRARY_NAMES" \ - -D LAPACK_LIBRARY_DIRS:PATH="$LAPACK_LIBRARY_DIRS" \ - -D LAPACK_INCLUDE_DIRS:PATH="$LAPACK_INCLUDE_DIRS" \ - -D LAPACK_LIBRARY_NAMES:STRING="$LAPACK_LIBRARY_NAMES" \ -D TPL_METIS_INCLUDE_DIRS:PATH=$METIS_INCLUDE_DIRS \ -D TPL_METIS_LIBRARIES:PATH=$METIS_LIBRARIES \ -D TPL_ParMETIS_INCLUDE_DIRS:PATH=$PARMETIS_INCLUDE_DIRS \ @@ -62,6 +66,7 @@ pbuild::configure() { -D Trilinos_ENABLE_Teuchos:BOOL=ON \ -D Trilinos_ENABLE_Tpetra:BOOL=ON \ -D Trilinos_ENABLE_TESTS:BOOL=OFF \ + "${config_args[@]}" \ "${MODULE_SRCDIR}" || exit 1 } From b779338398ece7175606ca37256ba795d8cf0f84 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 25 Jan 2018 10:08:59 +0100 Subject: [PATCH 3/5] Tools/emcs - module for version 25.3 --- Tools/emacs/25/variants | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tools/emacs/25/variants b/Tools/emacs/25/variants index e83b1a9..c8c3e1b 100644 --- a/Tools/emacs/25/variants +++ b/Tools/emacs/25/variants @@ -1 +1,2 @@ -emacs/25.1 unstable b:libungif/4.1.4 b:tiff/4.0.6 +emacs/25.1 stable b:libungif/4.1.4 b:tiff/4.0.3 +emacs/25.3 unstable b:libungif/4.1.4 b:tiff/4.0.9 From c5a6a4d7e2bb48c1a80ec49b34ca1108faa50a08 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 25 Jan 2018 10:09:35 +0100 Subject: [PATCH 4/5] Tools/emacs/build - SOURCE_URL added --- Tools/emacs/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tools/emacs/build b/Tools/emacs/build index ad58a41..498d23b 100755 --- a/Tools/emacs/build +++ b/Tools/emacs/build @@ -1,5 +1,7 @@ #!/usr/bin/env modbuild +SOURCE_URL="https://ftp.gnu.org/gnu/emacs/$P-$V.tar.xz" + case ${OS} in Darwin ) configure_args='--with-ns --with-jpeg=no' From b18008939956da603d0bc591ce59d381c11d6f35 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 25 Jan 2018 10:10:49 +0100 Subject: [PATCH 5/5] MPI/trilinos - build version 12.10.1-1 and newer with system BLAS --- MPI/trilinos/12/variants.Darwin | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 MPI/trilinos/12/variants.Darwin diff --git a/MPI/trilinos/12/variants.Darwin b/MPI/trilinos/12/variants.Darwin new file mode 100644 index 0000000..d706b26 --- /dev/null +++ b/MPI/trilinos/12/variants.Darwin @@ -0,0 +1,10 @@ +trilinos/12.8.1 stable gcc/4.8.5 openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 +trilinos/12.8.1 stable gcc/4.9.4 openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 +trilinos/12.8.1 stable gcc/5.4.0 openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 +trilinos/12.8.1 stable gcc/6.2.0 openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 + +trilinos/12.10.1 unstable gcc/4.8.5 openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 +trilinos/12.10.1 unstable gcc/4.9.4 openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 +trilinos/12.10.1 unstable gcc/5.4.0 openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 +trilinos/12.10.1-1 unstable gcc/5.4.0 openmpi/1.10.4 b:cmake/3.6.3 b:parmetis/4.0.3 +trilinos/12.10.1 unstable gcc/6.2.0 openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3