From db4007af31e19d263e52c8f69f23df7f0a955dcc Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Mon, 8 May 2017 15:49:47 +0200 Subject: [PATCH 01/11] boost 1.58 for gcc 6.3 --- Compiler/boost/1/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Compiler/boost/1/variants b/Compiler/boost/1/variants index 59120c3..3336bf8 100644 --- a/Compiler/boost/1/variants +++ b/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 From 486dffd2b2aa7216367c6f24e8f993630fb60dd6 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 9 May 2017 01:23:12 +0200 Subject: [PATCH 02/11] Compiler/OpenBLAS/build - compile without AVX and AVX2 due to problems on Mac --- Compiler/OpenBLAS/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Compiler/OpenBLAS/build b/Compiler/OpenBLAS/build index 29c3879..6a7bdfd 100755 --- a/Compiler/OpenBLAS/build +++ b/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" } From 20364c7083714dbdf3cc77b015fa9f110c050faf Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 9 May 2017 01:23:55 +0200 Subject: [PATCH 03/11] Compiler/boost/build - fix SOURCE_URL --- Compiler/boost/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Compiler/boost/build b/Compiler/boost/build index 2574c5e..01f99e8 100755 --- a/Compiler/boost/build +++ b/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() { From 1552ad1d6d6742ebec1af97f916993f9ff92212a Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 9 May 2017 01:24:56 +0200 Subject: [PATCH 04/11] Libraries/gmp/build - SOURCE_URL added --- Libraries/gmp/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Libraries/gmp/build b/Libraries/gmp/build index 27d52b8..6faae55 100755 --- a/Libraries/gmp/build +++ b/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}" \ From 20a721280872a6e52e747d7fafa57f24e02290b0 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 9 May 2017 01:25:31 +0200 Subject: [PATCH 05/11] Libraries/mpfr/build - SOURCE_URL added --- Libraries/mpc/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Libraries/mpc/build b/Libraries/mpc/build index 728cd08..0b67874 100755 --- a/Libraries/mpc/build +++ b/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}" \ From 1c33bde29b87da4cde6bb6b65c58e3ab053f02c4 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 9 May 2017 01:26:38 +0200 Subject: [PATCH 06/11] Libraries/mpc/1/variants - new variant 1.0.3-2 added with current gmp and mpfr --- Libraries/mpc/1/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Libraries/mpc/1/variants b/Libraries/mpc/1/variants index 52a87b1..004cdba 100644 --- a/Libraries/mpc/1/variants +++ b/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 From 2cb089e451126dbfb5ee94e78e225f07d941de54 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 9 May 2017 01:27:05 +0200 Subject: [PATCH 07/11] Libraries/mpfr/build - SOURCE_URL added --- Libraries/mpfr/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Libraries/mpfr/build b/Libraries/mpfr/build index 65bb324..b96abb2 100755 --- a/Libraries/mpfr/build +++ b/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}" \ From fcf5c17c83028ce79b7f6a3564a4972087d319a3 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 9 May 2017 01:29:37 +0200 Subject: [PATCH 08/11] MPI/parmetis/build - unset MACOSX_DEPLOYMENT_TARGET - use CMake for version 4.x.y - fix in install metis.h --- MPI/parmetis/build | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/MPI/parmetis/build b/MPI/parmetis/build index 099b6ae..b8366b7 100755 --- a/MPI/parmetis/build +++ b/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 From 16bf242baef79e7c2a3bd96c796af3a98e321e66 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 9 May 2017 01:32:00 +0200 Subject: [PATCH 09/11] Programming/Tk/build - add Macport's include dir to 'C_INCLUDE_PATH' if OS == Darwin - add Macport's library dir to 'LIBRARY_PATH' if OS == Darwin - both is a hack for X11 includes and libraries --- Programming/Tk/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Programming/Tk/build b/Programming/Tk/build index e6419ed..c80934c 100755 --- a/Programming/Tk/build +++ b/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 \ From cf295d58d9dfab7f6aba700cae1b12013bdbafe4 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 9 May 2017 01:33:08 +0200 Subject: [PATCH 10/11] Programming/gcc/5/variants - variant added for gcc 5.4.0 with current gmp, mpfr and mpc --- Programming/gcc/5/variants | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Programming/gcc/5/variants b/Programming/gcc/5/variants index 8e3178e..08b36c2 100644 --- a/Programming/gcc/5/variants +++ b/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 From 7d3396b516f77c386d268e471f9e4804f8f54595 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 9 May 2017 01:34:45 +0200 Subject: [PATCH 11/11] Programming/gcc/build - SOURCE_URL added - if OS == Darwin: use Macports as, ld, ar, nm, otool etc --- Programming/gcc/build | 52 +++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/Programming/gcc/build b/Programming/gcc/build index 6aa1615..2dfb42a 100755 --- a/Programming/gcc/build +++ b/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 \ - --prefix="${PREFIX}" \ - --enable-languages=c,c++,objc,obj-c++,lto,fortran \ - --with-gmp="${GMP_PREFIX}" \ - --with-mpfr="${MPFR_PREFIX}" \ - --with-mpc="${MPC_PREFIX}" \ - --enable-lto \ - --disable-multilib \ - --with-build-config=bootstrap-debug \ - --with-pkgversion="PSI Environment Module" \ - --with-build-config=bootstrap-debug \ - || exit 1 + local -a conf_args=() + conf_args+=( "--enable-languages=c,c++,objc,obj-c++,lto,fortran" ) + conf_args+=( "--with-gmp=${GMP_PREFIX}" ) + conf_args+=( "--with-mpfr=${MPFR_PREFIX}" ) + conf_args+=( "--with-mpc=${MPC_PREFIX}" ) + conf_args+=( "--enable-lto" ) + conf_args+=( "--disable-multilib" ) + conf_args+=( "--with-build-config=bootstrap-debug" ) + conf_args+=( "--with-pkgversion='PSI Environment Module'" ) + conf_args+=( "--with-build-config=bootstrap-debug" ) + + 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