Commit bd4586fe authored by gsell's avatar gsell

conflicts merged

parent e62c153e
6.0.0 stable gmp/6.0.0 stable
6.1.0 stable gmp/6.1.0 stable
gmp/6.1.1 stable
...@@ -8,15 +8,18 @@ pbuild::configure() { ...@@ -8,15 +8,18 @@ pbuild::configure() {
FC=$MPIFC FC=$MPIFC
FORTRAN=$MPIFORTRAN FORTRAN=$MPIFORTRAN
local conf=''
conf+=' --enable-shared'
conf+=' --enable-parallel'
conf+=' --enable-cxx'
conf+=' --enable-fortran'
conf+=' --enable-unsupported'
#conf+=' --enable-threadsafe'
conf+=' --with-pic'
"${MODULE_SRCDIR}"/configure \ "${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \ --prefix="${PREFIX}" \
--enable-shared \ ${conf} \
--enable-parallel \
--enable-cxx \
--enable-fortran \
--enable-unsupported \
--enable-threadsafe \
--with-pic \
|| exit 1 || exit 1
} }
......
gcc/5.1.0 deprecated b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2 gcc/5.1.0 deprecated b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
gcc/5.2.0 deprecated b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3 gcc/5.2.0 deprecated b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
gcc/5.3.0 stable b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3 gcc/5.3.0 stable b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
gcc/5.4.0 unstable b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
...@@ -16,6 +16,7 @@ pbuild::configure() { ...@@ -16,6 +16,7 @@ pbuild::configure() {
--with-mpc="${MPC_PREFIX}" \ --with-mpc="${MPC_PREFIX}" \
--enable-lto \ --enable-lto \
--disable-multilib \ --disable-multilib \
--with-build-config=bootstrap-debug \
--with-pkgversion="PSI Environment Module" \ --with-pkgversion="PSI Environment Module" \
--with-build-config=bootstrap-debug \ --with-build-config=bootstrap-debug \
|| exit 1 || exit 1
......
...@@ -6,7 +6,7 @@ declare variants=$2 ...@@ -6,7 +6,7 @@ declare variants=$2
declare -r OS=$(uname -s) declare -r OS=$(uname -s)
# File format example # File format example
# 1.10.2 unstable gcc/4.8.5 # openmpi/1.10.2 unstable gcc/4.8.5
declare -a toks=() declare -a toks=()
declare version='' declare version=''
declare release='' declare release=''
...@@ -22,7 +22,7 @@ while read -a toks; do ...@@ -22,7 +22,7 @@ while read -a toks; do
"${buildblock}" "${module#*/}" --release=${release} "${dependencies[@]/#/--with=}" "${buildblock}" "${module#*/}" --release=${release} "${dependencies[@]/#/--with=}"
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then
echo "Failed building: ${version} --release=${release} ${dependencies[@]/#/--with=}" 1>&2 echo "Failed building: ${module} --release=${release} ${dependencies[@]/#/--with=}" 1>&2
exit 42 exit 42
fi fi
done < "${variants}" done < "${variants}"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment