Merge branch 'master' of gitlab.psi.ch:Pmodules/buildblocks

Compiler/OpenBLAS/build

@@ -1,6 +1,6 @@
 #!/usr/bin/env modbuild
 
-#SOURCE_URL="http://github.com/xianyi/$P/archive/v$V.tar.gz"
+SOURCE_URL="http://github.com/xianyi/$P/archive/v$V.tar.gz"
 
 pbuild::configure() {
 	case ${COMPILER} in
@@ -21,6 +21,8 @@ DRVOPTS  = \$(NOOPT)
 ARCHFLAGS= -ru
 EOF
 	echo "USE_SIMPLE_THREADED_LEVEL3 = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
+	echo "NO_AVX = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
+	echo "NO_AVX2 = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
 	sed -i.bak "s/MACOSX_DEPLOYMENT_TARGET=.*/MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET/" "${MODULE_SRCDIR}/Makefile.system"
 }
 

Compiler/boost/1/variants

@@ -7,6 +7,7 @@ boost/1.55.0         stable     gcc/4.9.2 b:Python/3.4.0
 boost/1.58.0         stable	gcc/4.8.4 b:Python/3.4.0 
 boost/1.58.0         stable	gcc/4.8.5 b:Python/2.7.11 
 boost/1.58.0         stable	gcc/4.9.3 b:Python/2.7.11
+boost/1.58.0         stable     gcc/6.3.0 b:Python/2.7.12
 
 boost/1.61.0         stable	gcc/4.8.5 b:Python/2.7.11 
 boost/1.61.0         stable	gcc/6.2.0 b:Python/2.7.11 

Compiler/boost/build

@@ -1,6 +1,7 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://sourceforge.net/projects/boost/files/$P/$V/boost_${V_MAJOR}_${V_MINOR}_${V_PATCHLVL}.tar.gz"
+SOURCE_URL="https://netcologne.dl.sourceforge.net/project/boost/boost/$V/boost_${V_MAJOR}_${V_MINOR}_${V_PATCHLVL}.tar.gz"
+
 BOOST_BUILD_PATH="${MODULE_BUILDDIR}"
 
 pbuild::configure() {

Libraries/gmp/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+SOURCE_URL="https://gmplib.org/download/$P/$P-$V.tar.bz2"
+
 pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \

Libraries/mpc/1/variants

@@ -1,3 +1,4 @@
 mpc/1.0.2	stable		b:gmp/5.1.1 b:mpfr/3.1.2
 mpc/1.0.3	stable		b:gmp/6.1.0 b:mpfr/3.1.4
 mpc/1.0.3-1	stable		b:gmp/6.1.1 b:mpfr/3.1.4
+mpc/1.0.3-2	stable		b:gmp/6.1.2 b:mpfr/3.1.5

Libraries/mpc/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+SOURCE_URL="ftp://ftp.gnu.org/gnu/$P/$P-$V_MAJOR.$V_MINOR.$V_PATCHLVL.tar.gz"
+
 pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \

Libraries/mpfr/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+SOURCE_URL="http://www.mpfr.org/$P-current/$P-$V.tar.gz"
+
 pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \

MPI/parmetis/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+unset MACOSX_DEPLOYMENT_TARGET
+
 SOURCE_URL="http://glaros.dtc.umn.edu/gkhome/fetch/sw/$P/$P-$V.tar.gz"
 
 declare -ri MAJOR_VERSION=${V%%.*}
@@ -20,9 +22,23 @@ pbuild::configure() {
 	F90=$MPIF90
 	FC=$MPIFC
 	FORTRAN=$MPIFORTRAN
+	if (( MAJOR_VERSION == 4 )) ; then
+		cmake \
+			-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+			-DMETIS_PATH="${MODULE_SRCDIR}/metis" \
+			-DGKLIB_PATH="${MODULE_SRCDIR}/metis/GKlib" \
+			"${MODULE_SRCDIR}" \
+			|| exit 1
+	fi
 }
 
 pbuild::build() {
+	CC=$MPICC
+	CXX=$MPICXX
+	F77=$MPIF77
+	F90=$MPIF90
+	FC=$MPIFC
+	FORTRAN=$MPIFORTRAN
 	if (( MAJOR_VERSION == 3 )) ; then
 		cd "${MODULE_SRCDIR}"
 		make -e -j3 || exit 1
@@ -34,13 +50,11 @@ pbuild::build() {
 		cp METISLib/*.h $PREFIX/include/metis
 		cp lib*.a $PREFIX/lib
 	elif (( MAJOR_VERSION == 4 )); then
-		cd "${MODULE_SRCDIR}"
-		make config prefix=$PREFIX || exit 1
 		make -j3 || exit 1
 		make install
 
 		LIBMETIS_A=$(find . -name libmetis.a)
-		METIS_H=$(find . -name metis.h)
+		METIS_H=$(find "${MODULE_SRCDIR}" -name metis.h)
 
 		install -m 0644 $METIS_H    $PREFIX/include
 		install -m 0644 $LIBMETIS_A $PREFIX/lib

Programming/Tk/build

@@ -9,6 +9,8 @@ pbuild::configure() {
 		;;
 	Darwin )
 		srcdir="${MODULE_SRCDIR}/macosx"
+		C_INCLUDE_PATH+=":/opt/local/include"
+		LIBRARY_PATH+=":/opt/local/lib"
 		;;
 	esac
 	"${srcdir}"/configure \

Programming/gcc/5/variants

@@ -1,5 +1,5 @@
 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.3.0	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/5.4.0	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
+gcc/5.4.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
 

Programming/gcc/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+SOURCE_URL="https://ftp.gnu.org/gnu/gcc/$P-$V/$P-$V.tar.bz2"
+
 pbuild::patch_sources_Darwin() {
 	if (( V_MAJOR == 4 && V_MINOR <= 8 )) || \
 	   (( V_MAJOR == 4 && V_MINOR == 9 && V_PATCHLVL < 4)); then
@@ -12,18 +14,44 @@ pbuild::patch_sources_Darwin() {
 }
 
 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	local -a conf_args=()
-		--prefix="${PREFIX}" \
+	conf_args+=( "--enable-languages=c,c++,objc,obj-c++,lto,fortran" )
-		--enable-languages=c,c++,objc,obj-c++,lto,fortran \
+	conf_args+=( "--with-gmp=${GMP_PREFIX}" )
-		--with-gmp="${GMP_PREFIX}" \
+	conf_args+=( "--with-mpfr=${MPFR_PREFIX}" )
-		--with-mpfr="${MPFR_PREFIX}" \
+	conf_args+=( "--with-mpc=${MPC_PREFIX}" )
-		--with-mpc="${MPC_PREFIX}" \
+	conf_args+=( "--enable-lto" )
-		--enable-lto \
+	conf_args+=( "--disable-multilib" )
-		--disable-multilib \
+	conf_args+=( "--with-build-config=bootstrap-debug" )
-		--with-build-config=bootstrap-debug \
+	conf_args+=( "--with-pkgversion='PSI Environment Module'" )
-		--with-pkgversion="PSI Environment Module" \
+	conf_args+=( "--with-build-config=bootstrap-debug" )
-		--with-build-config=bootstrap-debug \
+
-		|| exit 1
+	case "${OS}" in
+	Darwin )
+		local -r prefix='/opt/local'
+		"${MODULE_SRCDIR}"/configure \
+			--prefix="${PREFIX}" \
+			"${conf_args[@]}" \
+			--with-as=${prefix}/bin/as \
+			--with-ld=${prefix}/bin/ld \
+			--with-ar=${prefix}/bin/ar \
+			AR_FOR_TARGET=${prefix}/bin/ar \
+			AS_FOR_TARGET=${prefix}/bin/as \
+			LD_FOR_TARGET=${prefix}/bin/ld \
+			NM_FOR_TARGET=${prefix}/bin/nm \
+			OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
+			RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
+			STRIP_FOR_TARGET=${prefix}/bin/strip \
+			OTOOL=${prefix}/bin/otool \
+			OTOOL64=${prefix}/bin/otool \
+			|| exit 1
+		;;
+	Linux )
+		"${MODULE_SRCDIR}"/configure \
+			--prefix="${PREFIX}" \
+			"${conf_args[@]}" \
+			|| exit 1
+		;;
+	esac
 }
 
 # use system gcc to compile