Merge remote branch 'origin/HEAD'
This commit is contained in:
@@ -1,4 +1,9 @@
|
||||
:Linux:Darwin: unstable gcc/4.8.5
|
||||
:Linux:Darwin: unstable gcc/4.9.3
|
||||
:Linux:Darwin: unstable gcc/5.2.0
|
||||
:Linux: unstable intel/15.3
|
||||
# comment
|
||||
1.10.0 Linux,Darwin deprecated gcc/4.8.4
|
||||
1.10.0 Linux,Darwin deprecated gcc/4.9.2
|
||||
1.10.0 Linux,Darwin deprecated gcc/4.9.3
|
||||
1.10.2 Linux,Darwin unstable gcc/4.8.5
|
||||
1.10.2 Linux,Darwin unstable gcc/4.9.3
|
||||
1.10.2 Linux,Darwin unstable gcc/5.2.0
|
||||
1.10.2 Linux,Darwin unstable gcc/5.3.0
|
||||
1.10.2 Linux unstable intel/15.3
|
||||
|
||||
@@ -1,8 +1,14 @@
|
||||
1.8.2,1.8.4,1.8.8 stable Linux,Darwin gcc/4.7.4
|
||||
1.8.2,1.8.4,1.8.8 stable Linux,Darwin gcc/4.8.3
|
||||
1.8.2,1.8.4,1.8.8 stable Linux,Darwin gcc/4.8.4
|
||||
1.8.2,1.8.4,1.8.8 unstable Linux,Darwin gcc/4.8.5
|
||||
1.8.2,1.8.4,1.8.8 stable Linux,Darwin gcc/4.9.2
|
||||
1.8.2,1.8.4,1.8.8 unstable Linux,Darwin gcc/4.9.3
|
||||
|
||||
|
||||
# comment
|
||||
1.8.2 Linux,Darwin stable gcc/4.7.4
|
||||
1.8.2 Linux,Darwin stable gcc/4.8.3
|
||||
1.8.2 Linux,Darwin stable gcc/4.8.4
|
||||
1.8.2 Linux,Darwin stable gcc/4.9.2
|
||||
1.8.4 Linux,Darwin stable gcc/4.7.4
|
||||
1.8.4 Linux,Darwin stable gcc/4.8.3
|
||||
1.8.4 Linux,Darwin stable gcc/4.8.4
|
||||
1.8.4 Linux,Darwin stable gcc/4.9.2
|
||||
1.8.8 Linux,Darwin deprecated gcc/4.8.4
|
||||
1.8.8 Linux,Darwin unstable gcc/4.8.5
|
||||
1.8.8 Linux,Darwin unstable gcc/4.9.3
|
||||
1.8.8 Linux,Darwin deprecated gcc/5.2.0
|
||||
1.8.8 Linux,Darwin unstable gcc/5.3.0
|
||||
|
||||
@@ -7,8 +7,11 @@ pbuild::configure() {
|
||||
--enable-mpi-cxx-seek \
|
||||
--enable-mpi-f90 \
|
||||
--enable-mpi-profile \
|
||||
--enable-orterun-prefix-by-default \
|
||||
--enable-shared \
|
||||
--enable-smp-locks \
|
||||
--with-sge=yes \
|
||||
--with-slurm=yes \
|
||||
|| exit 1
|
||||
}
|
||||
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
declare -r basedir=$(dirname $0)
|
||||
source '../../config/Pmodules.conf'
|
||||
|
||||
declare -r recipe="${basedir}/$1/build"
|
||||
shift
|
||||
|
||||
if [[ ! -x "${recipe}" ]]; then
|
||||
echo "Error: no recipe to build '$1'!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for cc in "${COMPILER_VERSIONS[@]}"; do
|
||||
for mpi in "${MPI_VERSIONS[@]}"; do
|
||||
for hdf5 in "${HDF5_VERSIONS[@]}"; do
|
||||
"${recipe}" "$@" --with=$cc --with=$mpi --with=$hdf5 || {
|
||||
echo "Oops: build failed for:"
|
||||
echo " compile: $cc"
|
||||
echo " mpi: $mpi"
|
||||
echo " hdf5: $hdf5"
|
||||
exit 1
|
||||
}
|
||||
done
|
||||
done
|
||||
done
|
||||
1
Libraries/gmp/5/variants
Normal file
1
Libraries/gmp/5/variants
Normal file
@@ -0,0 +1 @@
|
||||
5.1.1 Linux,Darwin stable
|
||||
2
Libraries/gmp/6/variants
Normal file
2
Libraries/gmp/6/variants
Normal file
@@ -0,0 +1,2 @@
|
||||
6.0.0 Linux,Darwin stable
|
||||
6.1.0 Linux,Darwin unstable
|
||||
2
Libraries/mpc/1/variants
Normal file
2
Libraries/mpc/1/variants
Normal file
@@ -0,0 +1,2 @@
|
||||
1.0.2 Linux,Darwin stable gmp/5.1.1 mpfr/3.1.2
|
||||
1.0.3 Linux,Darwin stable gmp/6.1.0 mpfr/3.1.4
|
||||
@@ -14,6 +14,5 @@ declare -rx CC=gcc
|
||||
|
||||
module use 'Libraries'
|
||||
pbuild::add_to_group 'Libraries'
|
||||
pbuild::set_build_dependencies 'gmp' 'mpfr'
|
||||
pbuild::make_all
|
||||
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
gmp/5.1.1
|
||||
mpfr/3.1.2
|
||||
@@ -1,2 +0,0 @@
|
||||
gmp/6.0.0
|
||||
mpfr/3.1.3
|
||||
3
Libraries/mpfr/3/variants
Normal file
3
Libraries/mpfr/3/variants
Normal file
@@ -0,0 +1,3 @@
|
||||
3.1.2 Linux,Darwin stable gmp/5.1.1
|
||||
3.1.3 Linux,Darwin stable gmp/6.0.0
|
||||
3.1.4 Linux,Darwin stable gmp/6.1.0
|
||||
@@ -1 +0,0 @@
|
||||
gmp/5.1.1
|
||||
@@ -1 +0,0 @@
|
||||
gmp/6.0.0
|
||||
@@ -3,6 +3,9 @@
|
||||
pbuild::configure() {
|
||||
"${MODULE_SRCDIR}"/configure \
|
||||
--prefix="${PREFIX}" \
|
||||
--with-pic=yes \
|
||||
--disable-shared \
|
||||
--disable-jpeg \
|
||||
|| exit 1
|
||||
}
|
||||
|
||||
|
||||
@@ -1,15 +1,13 @@
|
||||
#%Module1.0
|
||||
|
||||
set whatis "set of C functions that support the manipulation of TIFF image files."
|
||||
set url "http://www.libtiff.org/"
|
||||
set license "BSD-like, see: http://libtiff.org/misc.html"
|
||||
set maintainer "Achim Gsell <achim.gsell@psi.ch>"
|
||||
module-whatis "set of C functions that support the manipulation of TIFF image files."
|
||||
module-url "http://www.remotesensing.org/libtiff/"
|
||||
module-license "BSD-like, see: http://libtiff.org/misc.html"
|
||||
module-maintainer "Achim Gsell <achim.gsell@psi.ch>"
|
||||
|
||||
set help "
|
||||
module-help "
|
||||
This software provides support for the Tag Image File Format (TIFF), a
|
||||
widely used format for storing image data. The latest version of the TIFF
|
||||
specification is available on-line in several different formats, as are a
|
||||
number of Technical Notes (TTN's).
|
||||
"
|
||||
|
||||
source $env(PSI_LIBMODULES)
|
||||
|
||||
4
MPI/hdf5/1.10/variants
Normal file
4
MPI/hdf5/1.10/variants
Normal file
@@ -0,0 +1,4 @@
|
||||
1.10.0 Linux,Darwin unstable gcc/4.8.5 openmpi/1.10.2
|
||||
1.10.0 Linux,Darwin unstable gcc/4.9.3 openmpi/1.10.2
|
||||
1.10.0 Linux,Darwin unstable gcc/5.3.0 openmpi/1.10.2
|
||||
|
||||
35
MPI/hdf5/1.8/variants
Normal file
35
MPI/hdf5/1.8/variants
Normal file
@@ -0,0 +1,35 @@
|
||||
hdf5/1.8.12 Linux,Darwin stable gcc/4.7.4 openmpi/1.6.5
|
||||
hdf5/1.8.12 Linux,Darwin stable gcc/4.7.4 openmpi/1.8.2
|
||||
hdf5/1.8.12 Linux,Darwin stable gcc/4.7.4 openmpi/1.8.4
|
||||
hdf5/1.8.12 Linux,Darwin stable gcc/4.8.3 openmpi/1.6.5
|
||||
hdf5/1.8.12 Linux,Darwin stable gcc/4.8.3 openmpi/1.8.2
|
||||
hdf5/1.8.12 Linux,Darwin stable gcc/4.8.3 openmpi/1.8.4
|
||||
hdf5/1.8.12 Linux,Darwin stable gcc/4.8.4 openmpi/1.6.5
|
||||
hdf5/1.8.12 Linux,Darwin stable gcc/4.8.4 openmpi/1.8.2
|
||||
hdf5/1.8.12 Linux,Darwin stable gcc/4.8.4 openmpi/1.8.4
|
||||
hdf5/1.8.12 Linux,Darwin stable gcc/4.9.2 openmpi/1.6.5
|
||||
hdf5/1.8.12 Linux,Darwin stable gcc/4.9.2 openmpi/1.8.2
|
||||
hdf5/1.8.12 Linux,Darwin stable gcc/4.9.2 openmpi/1.8.4
|
||||
hdf5/1.8.14 Linux,Darwin stable gcc/4.7.4 openmpi/1.6.5
|
||||
hdf5/1.8.14 Linux,Darwin stable gcc/4.7.4 openmpi/1.8.2
|
||||
hdf5/1.8.14 Linux,Darwin stable gcc/4.7.4 openmpi/1.8.4
|
||||
hdf5/1.8.14 Linux,Darwin stable gcc/4.8.3 openmpi/1.6.5
|
||||
hdf5/1.8.14 Linux,Darwin stable gcc/4.8.3 openmpi/1.8.2
|
||||
hdf5/1.8.14 Linux,Darwin stable gcc/4.8.3 openmpi/1.8.4
|
||||
hdf5/1.8.14 Linux,Darwin stable gcc/4.8.4 openmpi/1.6.5
|
||||
hdf5/1.8.14 Linux,Darwin stable gcc/4.8.4 openmpi/1.8.2
|
||||
hdf5/1.8.14 Linux,Darwin stable gcc/4.8.4 openmpi/1.8.4
|
||||
hdf5/1.8.14 Linux,Darwin stable gcc/4.8.4 openmpi/1.8.8
|
||||
hdf5/1.8.14 Linux,Darwin stable gcc/4.9.2 openmpi/1.6.5
|
||||
hdf5/1.8.14 Linux,Darwin stable gcc/4.9.2 openmpi/1.8.2
|
||||
hdf5/1.8.14 Linux,Darwin stable gcc/4.9.2 openmpi/1.8.4
|
||||
hdf5/1.8.15.1 Linux,Darwin stable gcc/5.2.0 openmpi/1.8.8
|
||||
hdf5/1.8.16 Linux,Darwin unstable gcc/4.8.5 openmpi/1.8.2
|
||||
hdf5/1.8.16 Linux,Darwin unstable gcc/4.8.5 openmpi/1.8.4
|
||||
hdf5/1.8.16 Linux,Darwin unstable gcc/4.8.5 openmpi/1.8.8
|
||||
hdf5/1.8.16 Linux,Darwin unstable gcc/4.9.3 openmpi/1.8.2
|
||||
hdf5/1.8.16 Linux,Darwin unstable gcc/4.9.3 openmpi/1.8.4
|
||||
hdf5/1.8.16 Linux,Darwin unstable gcc/4.9.3 openmpi/1.8.8
|
||||
hdf5/1.8.16 Linux,Darwin unstable gcc/5.3.0 openmpi/1.8.2
|
||||
hdf5/1.8.16 Linux,Darwin unstable gcc/5.3.0 openmpi/1.8.4
|
||||
hdf5/1.8.16 Linux,Darwin unstable gcc/5.3.0 openmpi/1.8.8
|
||||
@@ -15,6 +15,7 @@ pbuild::configure() {
|
||||
--enable-cxx \
|
||||
--enable-fortran \
|
||||
--enable-unsupported \
|
||||
--enable-threadsafe \
|
||||
--with-pic \
|
||||
|| exit 1
|
||||
}
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
gcc/4.7.4
|
||||
gcc/4.8.4
|
||||
gcc/4.9.2
|
||||
gcc/5.2.0
|
||||
intel/15.3
|
||||
@@ -1,3 +0,0 @@
|
||||
openmpi/1.6.5
|
||||
openmpi/1.8.4
|
||||
mpich/3.1.4
|
||||
@@ -1,3 +0,0 @@
|
||||
1.8.12
|
||||
1.8.14
|
||||
1.8.15.1
|
||||
7
Programming/gcc/4/variants
Normal file
7
Programming/gcc/4/variants
Normal file
@@ -0,0 +1,7 @@
|
||||
4.7.4 Linux,Darwin stable gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
|
||||
4.8.3 Linux,Darwin stable gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
|
||||
4.8.4 Linux,Darwin stable gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
|
||||
4.8.5 Linux,Darwin stable gmp/6.0.0 mpfr/3.1.3 mpc/1.0.3
|
||||
4.9.0 Linux,Darwin deprecated gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
|
||||
4.9.2 Linux,Darwin stable gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
|
||||
4.9.3 Linux,Darwin stable gmp/6.0.0 mpfr/3.1.3 mpc/1.0.3
|
||||
4
Programming/gcc/5/variants
Normal file
4
Programming/gcc/5/variants
Normal file
@@ -0,0 +1,4 @@
|
||||
5.1.0 Linux,Darwin stable gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
|
||||
5.2.0 Linux,Darwin stable gmp/6.0.0 mpfr/3.1.3 mpc/1.0.3
|
||||
5.3.0 Linux,Darwin stable gmp/6.0.0 mpfr/3.1.3 mpc/1.0.3
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
gmp/6.0.0
|
||||
mpfr/3.1.3
|
||||
mpc/1.0.3
|
||||
@@ -1,3 +0,0 @@
|
||||
gmp/6.0.0
|
||||
mpfr/3.1.3
|
||||
mpc/1.0.3
|
||||
@@ -2,12 +2,11 @@
|
||||
|
||||
module use 'Libraries'
|
||||
|
||||
build_dependencies="${COMPILER} libungif tiff"
|
||||
build_dependencies="libungif tiff"
|
||||
|
||||
case ${OS} in
|
||||
Darwin )
|
||||
configure_args='--with-ns'
|
||||
build_dependencies="libungif tiff"
|
||||
configure_args='--with-ns --with-jpeg=no'
|
||||
CC=''
|
||||
CXX=''
|
||||
COMPILER=''
|
||||
|
||||
2
Tools/emacs/with_modules
Normal file
2
Tools/emacs/with_modules
Normal file
@@ -0,0 +1,2 @@
|
||||
libungif/4.1.4
|
||||
tiff/4.0.6
|
||||
4
Tools/git/2/variants
Normal file
4
Tools/git/2/variants
Normal file
@@ -0,0 +1,4 @@
|
||||
2.3.3 Linux,Darwin stable Tcl/8.6.4 Tk/8.6.4
|
||||
2.5.2 Linux,Darwin stable Tcl/8.6.4 Tk/8.6.4
|
||||
2.8.1 Linux,Darwin unstable Tcl/8.6.4 Tk/8.6.4
|
||||
|
||||
@@ -33,7 +33,7 @@ pbuild::install() {
|
||||
|
||||
pbuild::add_to_group 'Tools'
|
||||
pbuild::set_runtime_dependencies 'Tcl' 'Tk'
|
||||
pbuild::set_docfiles 'COPYING' 'README'
|
||||
pbuild::set_docfiles 'COPYING' 'README.md'
|
||||
pbuild::make_all
|
||||
|
||||
# Local Variables:
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
Tcl/8.6.4
|
||||
Tk/8.6.4
|
||||
@@ -6,11 +6,23 @@ declare variants=$2
|
||||
|
||||
declare -r OS=$(uname -s)
|
||||
|
||||
while read versions release oss dependencies; do
|
||||
[[ "${oss}" =~ "${OS}" ]] || continue
|
||||
versions_a=( ${versions//,/ } )
|
||||
dependencies_a=( ${dependencies//,/ } )
|
||||
for version in "${versions_a[@]}"; do
|
||||
"${buildblock}" "${version}" --release=${release} "${dependencies_a[@]/#/--with=}"
|
||||
done
|
||||
done < "${variants}"
|
||||
# File format example
|
||||
# 1.10.2 Linux,Darwin unstable gcc/4.8.5
|
||||
declare -a toks=()
|
||||
declare version=''
|
||||
declare oss=''
|
||||
declare release=''
|
||||
declare -a dependencies=()
|
||||
|
||||
while read -a toks; do
|
||||
# skip comment and empty line
|
||||
(( ${#toks[@]} == 0 )) && continue
|
||||
[[ "${toks[0]:0:1}" == "#" ]] && continue
|
||||
version=${toks[0]}
|
||||
oss=${toks[1]}
|
||||
release=${toks[2]}
|
||||
dependencies=( ${toks[@]:3} )
|
||||
|
||||
[[ "${oss}" =~ "${OS}" ]] || continue
|
||||
"${buildblock}" "${version}" --release=${release} "${dependencies[@]/#/--with=}"
|
||||
done < "${variants}"
|
||||
|
||||
Reference in New Issue
Block a user