From a980654315f24699d0e42d42af12d01a7c92e2de Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:41:43 +0200 Subject: [PATCH 01/43] OpenBLAS: variants for version 0.2.20 with gcc/5.5.0,6.4.0 added --- Compiler/OpenBLAS/0/variants | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Compiler/OpenBLAS/0/variants b/Compiler/OpenBLAS/0/variants index d77356f..ba11d3c 100644 --- a/Compiler/OpenBLAS/0/variants +++ b/Compiler/OpenBLAS/0/variants @@ -12,6 +12,8 @@ OpenBLAS/0.2.19 stable gcc/5.4.0 OpenBLAS/0.2.19 stable gcc/6.2.0 OpenBLAS/0.2.19 stable gcc/6.3.0 +OpenBLAS/0.2.20 stable gcc/5.5.0 +OpenBLAS/0.2.20 stable gcc/6.4.0 OpenBLAS/0.2.20 stable gcc/7.3.0 OpenBLAS/0.2.20 stable clang-macos/9.0.0 OpenBLAS/0.2.20 stable intel/17.4 From 91b1d8eb1cd2436d7e7d06bc460e1926cbad476e Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:44:22 +0200 Subject: [PATCH 02/43] boost/variants: - release 1.62.0, 1.64.0, 1.66.0 and 1.67.0 as stable - added variants: 1.66.0 with gcc/5.5.0,6.4.0 and 1.67.0 with gcc/5.5.0,6.4.0,7.3.0 --- Compiler/boost/1/variants | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Compiler/boost/1/variants b/Compiler/boost/1/variants index 076eed3..6d046f3 100644 --- a/Compiler/boost/1/variants +++ b/Compiler/boost/1/variants @@ -18,11 +18,19 @@ boost/1.62.0 stable gcc/4.8.5 Python/2.7.12 boost/1.62.0 stable gcc/4.9.4 Python/2.7.12 boost/1.62.0 stable gcc/5.4.0 Python/2.7.12 boost/1.62.0 stable gcc/6.2.0 Python/2.7.12 -boost/1.62.0 unstable gcc/6.3.0 Python/2.7.12 -boost/1.62.0 unstable gcc/7.1.0 Python/2.7.12 +boost/1.62.0 stable gcc/6.3.0 Python/2.7.12 +boost/1.62.0 stable gcc/7.1.0 Python/2.7.12 boost/1.63.0 stable gcc/6.3.0 Python/2.7.12 -boost/1.64.0 unstable gcc/5.4.0 Python/2.7.12 +boost/1.64.0 stable gcc/5.4.0 Python/2.7.12 -boost/1.66.0 unstable gcc/7.3.0 b:Python/2.7.12 -boost/1.66.0 unstable clang-macos/9.0.0 b:Python/2.7.12 -boost/1.66.0 unstable intel/17.4 b:Python/2.7.12 +boost/1.66.0 stable gcc/5.5.0 b:Python/2.7.12 +boost/1.66.0 stable gcc/6.4.0 b:Python/2.7.12 +boost/1.66.0 stable gcc/7.3.0 b:Python/2.7.12 +boost/1.66.0 stable clang-macos/9.0.0 b:Python/2.7.12 +boost/1.66.0 stable intel/17.4 b:Python/2.7.12 + +boost/1.67.0 stable gcc/5.5.0 b:Python/2.7.14 +boost/1.67.0 stable gcc/6.4.0 b:Python/2.7.14 +boost/1.67.0 stable gcc/7.3.0 b:Python/2.7.14 +boost/1.67.0 stable clang-macos/9.0.0 b:Python/2.7.14 +boost/1.67.0 stable intel/17.4 b:Python/2.7.14 From 21cfdc4aefdef34cc6f4e57bcfac408a7d9e427f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:45:40 +0200 Subject: [PATCH 03/43] gsl/variants: - release version 2.2.1, 2.4 as stable - version 2.4 with gcc/5.5.0, 6.4.0 added --- Compiler/gsl/2/variants | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Compiler/gsl/2/variants b/Compiler/gsl/2/variants index e9bd14c..223f710 100644 --- a/Compiler/gsl/2/variants +++ b/Compiler/gsl/2/variants @@ -1,9 +1,11 @@ -gsl/2.2.1 stable gcc/4.8.5 -gsl/2.2.1 stable gcc/4.9.4 -gsl/2.2.1 stable gcc/5.4.0 -gsl/2.2.1 stable gcc/6.2.0 -gsl/2.2.1 stable gcc/6.3.0 +gsl/2.2.1 stable gcc/4.8.5 +gsl/2.2.1 stable gcc/4.9.4 +gsl/2.2.1 stable gcc/5.4.0 +gsl/2.2.1 stable gcc/6.2.0 +gsl/2.2.1 stable gcc/6.3.0 -gsl/2.4.0 stable gcc/7.3.0 -gsl/2.4.0 stable clang-macos/9.0.0 -gsl/2.4.0 stable intel/17.4 +gsl/2.4 stable gcc/5.5.0 +gsl/2.4 stable gcc/6.4.0 +gsl/2.4 stable gcc/7.3.0 +gsl/2.4 stable clang-macos/9.0.0 +gsl/2.4 stable intel/17.4 From bc79a17b735e58fface48f1a664718a5093fc6f0 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:46:52 +0200 Subject: [PATCH 04/43] gtest/variants: - version 1.7.0 with gcc/5.5.0,6.4.0 added --- Compiler/gtest/1/variants | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Compiler/gtest/1/variants b/Compiler/gtest/1/variants index 8a77ffc..f90a728 100644 --- a/Compiler/gtest/1/variants +++ b/Compiler/gtest/1/variants @@ -1,3 +1,5 @@ gtest/1.7.0 stable b:cmake b:gcc/5.4.0 +gtest/1.7.0 stable b:cmake b:gcc/5.5.0 +gtest/1.7.0 stable b:cmake b:gcc/6.4.0 gtest/1.7.0 stable b:cmake b:gcc/7.3.0 gtest/1.7.0 stable b:cmake b:clang-macos/9.0.0 From 12f38165ed814c79ca9e906c7e0c95a0811dad75 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:48:58 +0200 Subject: [PATCH 05/43] hdf5_serial: - version 1.10.2 with gcc/5.5.0,6.4.0,7.3.0 and intel/18.2 added - release old versions as stable - fix SOURCE_URL in build script --- Compiler/hdf5_serial/1/variants.Linux | 22 +++++++++++++++++----- Compiler/hdf5_serial/build | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Compiler/hdf5_serial/1/variants.Linux b/Compiler/hdf5_serial/1/variants.Linux index 9aaba2e..4fee0be 100644 --- a/Compiler/hdf5_serial/1/variants.Linux +++ b/Compiler/hdf5_serial/1/variants.Linux @@ -32,9 +32,12 @@ hdf5_serial/1.8.17 stable gcc/6.2.0 hdf5_serial/1.8.18 stable gcc/4.8.5 hdf5_serial/1.8.18 stable gcc/4.9.4 hdf5_serial/1.8.18 stable gcc/5.4.0 +hdf5_serial/1.8.18 stable gcc/5.5.0 hdf5_serial/1.8.18 stable gcc/6.2.0 hdf5_serial/1.8.18 stable gcc/6.3.0 +hdf5_serial/1.8.18 stable gcc/6.4.0 hdf5_serial/1.8.18 stable gcc/7.2.0 +hdf5_serial/1.8.18 stable gcc/7.3.0 hdf5_serial/1.8.19 stable gcc/4.8.5 hdf5_serial/1.8.19 stable gcc/4.9.4 @@ -42,19 +45,28 @@ hdf5_serial/1.8.19 stable gcc/5.4.0 hdf5_serial/1.8.19 stable gcc/6.3.0 hdf5_serial/1.8.19 stable gcc/7.2.0 +hdf5_serial/1.8.20 stable gcc/5.5.0 +hdf5_serial/1.8.20 stable gcc/6.4.0 +hdf5_serial/1.8.20 stable gcc/7.3.0 + hdf5_serial/1.10.1 stable gcc/4.8.5 hdf5_serial/1.10.1 stable gcc/4.9.4 hdf5_serial/1.10.1 stable gcc/5.4.0 +hdf5_serial/1.10.1 stable gcc/5.5.0 hdf5_serial/1.10.1 stable gcc/6.3.0 +hdf5_serial/1.10.1 stable gcc/6.4.0 hdf5_serial/1.10.1 stable gcc/7.2.0 hdf5_serial/1.10.1 stable gcc/7.3.0 -hdf5_serial/1.10.2 stable gcc/7.3.0 -hdf5_serial/1.10.1 unstable intel/17.1 +hdf5_serial/1.10.1 stable intel/17.1 hdf5_serial/1.10.1 stable intel/17.4 -hdf5_serial/1.10.2 unstable intel/18.2 -hdf5_serial/1.10.1 unstable pgi/17.3 -hdf5_serial/1.10.1 unstable pgi/17.7 +hdf5_serial/1.10.1 stable pgi/17.3 +hdf5_serial/1.10.1 stable pgi/17.7 + +hdf5_serial/1.10.2 stable gcc/5.5.0 +hdf5_serial/1.10.2 stable gcc/6.4.0 +hdf5_serial/1.10.2 stable gcc/7.3.0 +hdf5_serial/1.10.2 stable intel/18.2 diff --git a/Compiler/hdf5_serial/build b/Compiler/hdf5_serial/build index c8be78b..5526142 100755 --- a/Compiler/hdf5_serial/build +++ b/Compiler/hdf5_serial/build @@ -1,6 +1,6 @@ #!/usr/bin/env modbuild -SOURCE_URL="https://support.hdfgroup.org/ftp/HDF5/current${V_MAJOR}${V_MINOR}/src/hdf5-$V.tar.bz2" +SOURCE_URL="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${V_MAJOR}.${V_MINOR}/hdf5-$V/src/hdf5-$V.tar.bz2" pbuild::configure() { test "$(basename "$CPP")" = "pgprepro" && { From c3416f4d412d7b4a51888857f1ff73e95acf4ca2 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:49:38 +0200 Subject: [PATCH 06/43] mpich/variants - release 3.2.1 with intel/17.4 as stable --- Compiler/mpich/3/variants | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Compiler/mpich/3/variants b/Compiler/mpich/3/variants index 22f9e8b..16deb91 100644 --- a/Compiler/mpich/3/variants +++ b/Compiler/mpich/3/variants @@ -1,3 +1,4 @@ +mpich/3.2.1 stable gcc/5.5.0 mpich/3.2.1 stable gcc/6.4.0 mpich/3.2.1 stable gcc/7.3.0 -mpich/3.2.1 unstable intel/17.4 +mpich/3.2.1 stable intel/17.4 From f937c8c97393e4bb4637a7a2f24f3f83c1d8c656 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:53:43 +0200 Subject: [PATCH 07/43] openmpi/variants: - variants added for gcc/5.5.0,6.4.0, 7.3.0 to versions 1.10.7,2.1.2,3.0.0 - version 2.1.3 and 3.0.1 with gcc/5.5.0,6.4.0,7.3.0 added --- Compiler/openmpi/1.10/variants.Linux | 2 ++ Compiler/openmpi/2.1/variants.Linux | 13 ++++++++++--- Compiler/openmpi/3.0/variants.Linux | 5 +++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Compiler/openmpi/1.10/variants.Linux b/Compiler/openmpi/1.10/variants.Linux index 4397553..a930555 100644 --- a/Compiler/openmpi/1.10/variants.Linux +++ b/Compiler/openmpi/1.10/variants.Linux @@ -22,8 +22,10 @@ openmpi/1.10.4 stable gcc/6.3.0 openmpi/1.10.7 stable gcc/4.8.5 b:cuda/8.0.44 openmpi/1.10.7 stable gcc/4.9.4 b:cuda/8.0.44 openmpi/1.10.7 stable gcc/5.4.0 b:cuda/8.0.44 +openmpi/1.10.7 stable gcc/5.5.0 openmpi/1.10.7 stable gcc/6.2.0 openmpi/1.10.7 stable gcc/6.3.0 +openmpi/1.10.7 stable gcc/6.4.0 openmpi/1.10.7 stable gcc/7.2.0 openmpi/1.10.7 stable gcc/7.3.0 diff --git a/Compiler/openmpi/2.1/variants.Linux b/Compiler/openmpi/2.1/variants.Linux index 142c19e..9dbd71b 100644 --- a/Compiler/openmpi/2.1/variants.Linux +++ b/Compiler/openmpi/2.1/variants.Linux @@ -1,8 +1,15 @@ -openmpi/2.1.1 stable gcc/6.4.0 openmpi/2.1.0 stable gcc/7.1.0 -openmpi/2.1.1 stable gcc/7.2.0 -openmpi/2.1.2 stable gcc/7.3.0 +openmpi/2.1.1 stable gcc/6.4.0 +openmpi/2.1.1 stable gcc/7.2.0 openmpi/2.1.1 unstable intel/17.1 openmpi/2.1.1 stable intel/17.4 + +openmpi/2.1.2 stable gcc/5.5.0 +openmpi/2.1.2 stable gcc/6.4.0 +openmpi/2.1.2 stable gcc/7.3.0 openmpi/2.1.2 stable intel/17.4 + +openmpi/2.1.3 stable gcc/5.5.0 +openmpi/2.1.3 stable gcc/6.4.0 +openmpi/2.1.3 stable gcc/7.3.0 diff --git a/Compiler/openmpi/3.0/variants.Linux b/Compiler/openmpi/3.0/variants.Linux index bff5698..ea5c862 100644 --- a/Compiler/openmpi/3.0/variants.Linux +++ b/Compiler/openmpi/3.0/variants.Linux @@ -1,4 +1,9 @@ +openmpi/3.0.0 stable gcc/5.5.0 openmpi/3.0.0 stable gcc/6.4.0 openmpi/3.0.0 stable gcc/7.2.0 openmpi/3.0.0 stable gcc/7.3.0 openmpi/3.0.0 stable intel/17.4 + +openmpi/3.0.1 stable gcc/5.5.0 +openmpi/3.0.1 stable gcc/6.4.0 +openmpi/3.0.1 stable gcc/7.3.0 From 285d6d2741af5d689bb7e8a9e0af5f1dc8cf53ad Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:55:34 +0200 Subject: [PATCH 08/43] root/variants - version 6.12.06 with gcc/5.5.0,6.4.0 added - versions < 6.12.06 released as stable --- Compiler/root/6/variants | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Compiler/root/6/variants b/Compiler/root/6/variants index 4eff74a..c11624b 100644 --- a/Compiler/root/6/variants +++ b/Compiler/root/6/variants @@ -6,9 +6,11 @@ root/6.08.00 stable gcc/4.9.4 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3 root/6.08.00 stable gcc/5.4.0 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3 root/6.08.00 stable gcc/6.2.0 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3 -root/6.08.02 unstable gcc/4.8.5 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 -root/6.08.02 unstable gcc/4.9.4 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 -root/6.08.02 unstable gcc/5.4.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 -root/6.08.02 unstable gcc/6.2.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 +root/6.08.02 stable gcc/4.8.5 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 +root/6.08.02 stable gcc/4.9.4 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 +root/6.08.02 stable gcc/5.4.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 +root/6.08.02 stable gcc/6.2.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3 +root/6.12.06 unstable gcc/5.5.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3 +root/6.12.06 unstable gcc/6.4.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3 root/6.12.06 unstable gcc/7.3.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3 From 6138856a1d551b3c5c3626932f5b2e0c66bc5a97 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:56:42 +0200 Subject: [PATCH 09/43] root/build: - try to install Oracle instant-client libs only if available --- Compiler/root/build | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/Compiler/root/build b/Compiler/root/build index 863eb2b..b6b08d8 100755 --- a/Compiler/root/build +++ b/Compiler/root/build @@ -14,21 +14,24 @@ Darwin ) Linux ) INSTANTCLIENT_INCLUDE_DIR='/usr/include/oracle/12.1/client64' INSTANTCLIENT_LIBRARY_DIR='/usr/lib/oracle/12.1/client64/lib' - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntshcore.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntshcore.so.12.1" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntsh.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntsh.so.12.1" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libipc1.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libmql1.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libnnz12.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocci.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocci.so.12.1" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libociei.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocijdbc12.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libons.so" ) - EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/liboramysql12.so" ) - config_args+=" --with-oracle-incdir=${INSTANTCLIENT_INCLUDE_DIR}" - config_args+=" --with-oracle-libdir=${INSTANTCLIENT_LIBRARY_DIR}" + if [[ -e ${INSTANTCLIENT_INCLUDE_DIR} ]] && \ + [[ -e ${INSTANTCLIENT_LIBRARY_DIR} ]]; then + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntshcore.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntshcore.so.12.1" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntsh.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntsh.so.12.1" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libipc1.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libmql1.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libnnz12.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocci.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocci.so.12.1" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libociei.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocijdbc12.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libons.so" ) + EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/liboramysql12.so" ) + config_args+=" --with-oracle-incdir=${INSTANTCLIENT_INCLUDE_DIR}" + config_args+=" --with-oracle-libdir=${INSTANTCLIENT_LIBRARY_DIR}" + fi ;; *) ;; From 760a791bfa9b9d70b03a8c71cf8dbff28c34e108 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:57:12 +0200 Subject: [PATCH 10/43] Python/build - do not compile pandas module --- Programming/Python/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Programming/Python/build b/Programming/Python/build index 6549949..285291d 100755 --- a/Programming/Python/build +++ b/Programming/Python/build @@ -28,7 +28,7 @@ pbuild::post_install() { pip${V_MAJOR} install scipy pip${V_MAJOR} install matplotlib pip${V_MAJOR} install ipython - pip${V_MAJOR} install pandas + #pip${V_MAJOR} install pandas pip${V_MAJOR} install sympy pip${V_MAJOR} install nose #pip${V_MAJOR} install mpi4py From 2d56e7795f702df59c63b5e5aa22823d76584c4a Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:57:35 +0200 Subject: [PATCH 11/43] perl - release 5.26.1 as stable --- Programming/perl/5/variants | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Programming/perl/5/variants b/Programming/perl/5/variants index b36d254..8e95d73 100644 --- a/Programming/perl/5/variants +++ b/Programming/perl/5/variants @@ -1 +1 @@ -perl/5.26.1 unstable +perl/5.26.1 stable From baf5e279ebcaf50f34483756ad4f5696639c3fa6 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:58:00 +0200 Subject: [PATCH 12/43] asciidoc: - release 8.6.9 as stable --- Tools/asciidoc/8/variants | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/asciidoc/8/variants b/Tools/asciidoc/8/variants index f3f1245..6db2654 100644 --- a/Tools/asciidoc/8/variants +++ b/Tools/asciidoc/8/variants @@ -1 +1 @@ -asciidoc/8.6.9 unstable Python/2.7.14 +asciidoc/8.6.9 stable Python/2.7.14 From 0ff2f418741c048f346d1b530836e20b280fbceb Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 15 May 2018 12:58:51 +0200 Subject: [PATCH 13/43] update_releases - first version of script to update releases according the variant files --- bin/update_releases | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 bin/update_releases diff --git a/bin/update_releases b/bin/update_releases new file mode 100755 index 0000000..2efe8b5 --- /dev/null +++ b/bin/update_releases @@ -0,0 +1,28 @@ +#!/bin/bash + +declare buildblock=$1 +declare variants=$2 + +declare -r OS=$(uname -s) + +# File format example +# openmpi/1.10.2 unstable gcc/4.8.5 +declare -a toks=() +declare version='' +declare release='' +declare -a dependencies=() + +while read -a toks; do + # skip comment and empty line + (( ${#toks[@]} == 0 )) && continue + [[ "${toks[0]:0:1}" == "#" ]] && continue + module=${toks[0]} + release=${toks[1]} + dependencies=( ${toks[@]:2} ) + + "${buildblock}" "${module#*/}" "${dependencies[@]/#/--with=}" + if [[ $? != 0 ]]; then + echo "Failed building: ${module} --release=${release} ${dependencies[@]/#/--with=}" 1>&2 + exit 42 + fi +done < "${variants}" From 462b8d97cd2f5b582fd9ec663f71ff1204933d91 Mon Sep 17 00:00:00 2001 From: gsell Date: Tue, 15 May 2018 15:33:59 +0200 Subject: [PATCH 14/43] Update README.md --- MPI/elegant/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MPI/elegant/README.md b/MPI/elegant/README.md index 0d92392..8254c23 100644 --- a/MPI/elegant/README.md +++ b/MPI/elegant/README.md @@ -50,8 +50,9 @@ ELEGANT_VERSION=34.2.0 ## Setup Environment ``` -DOWNLOAD_DIR='/afs/psi.ch/software/Pmodules/distfiles/elegant' -PREFIX=/opt/psi/MPI/elegant/${ELEGANT_VERSION}/${MPI}/${MPI_VERSION}/${COMPILER}/${COMPILER_VERSION} +source "${PMODULES_ROOT}/config/modbuild.conf" +DOWNLOAD_DIR="${PMODULES_DISTFILESDIR}/elegant" +PREFIX="${PMODULES_ROOT}/MPI/elegant/${ELEGANT_VERSION}/${MPI}/${MPI_VERSION}/${COMPILER}/${COMPILER_VERSION}" export EPICS_BASE="${PREFIX}/epics/base" export HOST_ARCH=linux-x86_64 From 31d4a0d78f8be670b43f7f5f18a9989a8a22d809 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Mon, 2 Jul 2018 09:21:26 +0200 Subject: [PATCH 15/43] openmpi/3.1.1 for gcc/8.1.0 --- Compiler/openmpi/3.0/variants.Linux | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Compiler/openmpi/3.0/variants.Linux b/Compiler/openmpi/3.0/variants.Linux index 1e119ac..8a2c158 100644 --- a/Compiler/openmpi/3.0/variants.Linux +++ b/Compiler/openmpi/3.0/variants.Linux @@ -7,5 +7,8 @@ openmpi/3.0.0 stable intel/17.4 openmpi/3.0.1 stable gcc/5.5.0 openmpi/3.0.1 stable gcc/6.4.0 openmpi/3.0.1 stable gcc/7.3.0 -openmpi/3.0.1 unstable gcc/8.1.0 +openmpi/3.0.1 stable gcc/7.3.0 +openmpi/3.0.1 stable gcc/8.1.0 openpmi/3.0.1 unstable intel/18.2 + +openmpi/3.1.1 stable gcc/8.1.0 From 4c760838f49a18d2810c9c881d5cd14b37ff34b1 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 2 Jul 2018 13:07:39 +0200 Subject: [PATCH 16/43] lammps/files/lammps-2018.3.tar.gz added --- .gitattributes | 1 + MPI/lammps/2018/variants | 1 + MPI/lammps/files/lammps-2018.3.tar.gz | 3 +++ 3 files changed, 5 insertions(+) create mode 100644 .gitattributes create mode 100644 MPI/lammps/2018/variants create mode 100644 MPI/lammps/files/lammps-2018.3.tar.gz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f087b42 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.tar.gz filter=lfs diff=lfs merge=lfs -text diff --git a/MPI/lammps/2018/variants b/MPI/lammps/2018/variants new file mode 100644 index 0000000..b74e7a5 --- /dev/null +++ b/MPI/lammps/2018/variants @@ -0,0 +1 @@ +lammps/2018.3 unstable gcc/7.3.0 openmpi/3.0.1 diff --git a/MPI/lammps/files/lammps-2018.3.tar.gz b/MPI/lammps/files/lammps-2018.3.tar.gz new file mode 100644 index 0000000..f85294c --- /dev/null +++ b/MPI/lammps/files/lammps-2018.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a00bda549f0bc75196ae58c9176198af03c3ce9a79640ecf1a521fc32978002 +size 124306996 From 443b3b092ea3820516930f21fed54451eee5fd8c Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 2 Jul 2018 13:11:19 +0200 Subject: [PATCH 17/43] netcdf/build reviewd, build Fortran interface --- HDF5/netcdf/build | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/HDF5/netcdf/build b/HDF5/netcdf/build index b013a6f..52e6fc8 100755 --- a/HDF5/netcdf/build +++ b/HDF5/netcdf/build @@ -1,5 +1,7 @@ #!/usr/bin/env modbuild +SOURCE_URL="https://www.unidata.ucar.edu/downloads/$P/ftp/$P-$V.tar.gz" + pbuild::pre_configure() { : } @@ -15,12 +17,24 @@ pbuild::configure() { --prefix="${PREFIX}" \ --enable-netcdf-4 \ --with-pic \ + --enable-pnetcdf \ + --enable-remote-fortran-bootstrap \ || exit 1 } +pbuild::build() { + make check + make + make install + make build-netcdf-fortran + make install-netcdf-fortran +} + +pbuild::install() { + : +} + pbuild::add_to_group 'HDF5' -pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5' -pbuild::set_build_dependencies "${COMPILER}" "${MPI}" 'hdf5' pbuild::set_docfiles 'COPYRIGHT' 'README.md' 'RELEASE_NOTES.md' pbuild::make_all From 16c0a5b67653d0264b1e8d6b5c7dd50bf78a0577 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 2 Jul 2018 13:12:40 +0200 Subject: [PATCH 18/43] mpc: review, variant for 1.1.0 with gmp/6.1.2 and mpfr/4.0.1 added --- Libraries/mpc/1/variants | 1 + Libraries/mpc/build | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Libraries/mpc/1/variants b/Libraries/mpc/1/variants index 97455ac..6c43014 100644 --- a/Libraries/mpc/1/variants +++ b/Libraries/mpc/1/variants @@ -3,3 +3,4 @@ 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 mpc/1.1.0 stable b:gmp/6.1.2 b:mpfr/4.0.0 +mpc/1.1.0-1 unstable b:gmp/6.1.2 b:mpfr/4.0.1 diff --git a/Libraries/mpc/build b/Libraries/mpc/build index 0b67874..be22992 100755 --- a/Libraries/mpc/build +++ b/Libraries/mpc/build @@ -1,6 +1,10 @@ #!/usr/bin/env modbuild -SOURCE_URL="ftp://ftp.gnu.org/gnu/$P/$P-$V_MAJOR.$V_MINOR.$V_PATCHLVL.tar.gz" +module use 'Libraries' + +pbuild::set_source_url "ftp://ftp.gnu.org/gnu/${P}/${P}-${V_PKG}.tar.gz" +pbuild::add_to_group 'Libraries' +pbuild::use_cc '/usr/bin/cc' pbuild::configure() { "${MODULE_SRCDIR}"/configure \ @@ -11,10 +15,5 @@ pbuild::configure() { || exit 1 } -# use system gcc to compile -declare -rx CC=gcc - -module use 'Libraries' -pbuild::add_to_group 'Libraries' pbuild::make_all From 249b5e7315efe3b823377f9b349de3e5a2f2e0cb Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 2 Jul 2018 13:13:28 +0200 Subject: [PATCH 19/43] mpfr: version 4.0.1 added --- Libraries/mpfr/4/variants | 1 + 1 file changed, 1 insertion(+) diff --git a/Libraries/mpfr/4/variants b/Libraries/mpfr/4/variants index cec1cb1..3d8e833 100644 --- a/Libraries/mpfr/4/variants +++ b/Libraries/mpfr/4/variants @@ -1 +1,2 @@ mpfr/4.0.0 stable b:gmp/6.1.2 +mpfr/4.0.1 stable b:gmp/6.1.2 From d5b59c1a96e86b3f3d2ee618762fd93ed8f325c9 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 2 Jul 2018 13:14:08 +0200 Subject: [PATCH 20/43] lammps/build reviewed --- MPI/lammps/build | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/MPI/lammps/build b/MPI/lammps/build index df7bb75..5dd6318 100755 --- a/MPI/lammps/build +++ b/MPI/lammps/build @@ -1,7 +1,10 @@ #!/usr/bin/env modbuild -SOURCE_URL="lammps-2017.8.tar.gz" - +pbuild::add_to_group 'MPI' +pbuild::set_download_url="file:///lammps-2017.8.tar.gz" +pbuild::set_docfiles \ + LICENSE \ + README pbuild::compile_in_sourcetree pbuild::configure() { @@ -18,9 +21,5 @@ pbuild::install() { strip "${PREFIX}/bin/lmp_omp" } -pbuild::add_to_group 'MPI' -pbuild::set_docfiles \ - LICENSE \ - README pbuild::make_all From 12f9f2466e48bd192cc1aadc063a6f5193a5cc4b Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 2 Jul 2018 13:15:03 +0200 Subject: [PATCH 21/43] emacs/25/variants: release version 25.3 as stable --- Tools/emacs/25/variants | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/emacs/25/variants b/Tools/emacs/25/variants index c8c3e1b..c131366 100644 --- a/Tools/emacs/25/variants +++ b/Tools/emacs/25/variants @@ -1,2 +1,2 @@ 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 +emacs/25.3 stable b:libungif/4.1.4 b:tiff/4.0.9 From d88ea6b84600e20388d24b821476d92aa5d5424f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 2 Jul 2018 13:16:13 +0200 Subject: [PATCH 22/43] gnuplot: build-script reviewed, version 5.2.4 added to variants --- Tools/gnuplot/5/variants | 1 + Tools/gnuplot/build | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Tools/gnuplot/5/variants b/Tools/gnuplot/5/variants index 1093a84..988e97d 100644 --- a/Tools/gnuplot/5/variants +++ b/Tools/gnuplot/5/variants @@ -1,3 +1,4 @@ gnuplot/4.6.3 stable gnuplot/5.0.0 stable gnuplot/5.2.0 stable +gnuplot/5.2.4 stable diff --git a/Tools/gnuplot/build b/Tools/gnuplot/build index f321704..d774601 100755 --- a/Tools/gnuplot/build +++ b/Tools/gnuplot/build @@ -1,6 +1,8 @@ #!/usr/bin/env modbuild -SOURCE_URL="https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-$V.tar.gz" +pbuild::add_to_group 'Tools' +pbuild::set_source_url "https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-$V.tar.gz" +pbuild::set_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README' pbuild::configure() { "${MODULE_SRCDIR}"/configure \ @@ -10,8 +12,6 @@ pbuild::configure() { || exit 1 } -pbuild::add_to_group 'Tools' -pbuild::set_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README' pbuild::make_all # Local Variables: From 7189810a8d184950b78ab179d70acb7e3239d497 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 2 Jul 2018 16:13:28 +0200 Subject: [PATCH 23/43] lammps-2018.3.tar.gz moved to repository Pmodules/download --- MPI/lammps/files/lammps-2018.3.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 MPI/lammps/files/lammps-2018.3.tar.gz diff --git a/MPI/lammps/files/lammps-2018.3.tar.gz b/MPI/lammps/files/lammps-2018.3.tar.gz deleted file mode 100644 index f85294c..0000000 --- a/MPI/lammps/files/lammps-2018.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a00bda549f0bc75196ae58c9176198af03c3ce9a79640ecf1a521fc32978002 -size 124306996 From 54586b75c8848ee76e385eb2d4bab765e8a1f0d6 Mon Sep 17 00:00:00 2001 From: Hans-Christian Stadler Kleeb Date: Mon, 9 Jul 2018 14:08:22 +0200 Subject: [PATCH 24/43] hdf5/1.10.2 for openmpi/3.0.1 and gcc/7.3.0 --- MPI/hdf5/1.10/variants.Linux | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MPI/hdf5/1.10/variants.Linux b/MPI/hdf5/1.10/variants.Linux index 9e12ef4..2109214 100644 --- a/MPI/hdf5/1.10/variants.Linux +++ b/MPI/hdf5/1.10/variants.Linux @@ -12,3 +12,5 @@ hdf5/1.10.1 unstable intel/17.4 openmpi/1.10.7 hdf5/1.10.1 unstable intel/17.4 openmpi/2.1.2 hdf5/1.10.1 unstable intel/17.4 openmpi/3.0.0 hdf5/1.10.1 unstable intel/17.4 intel-mpi/17.4 + +hdf5/1.10.2 stable gcc/7.3.0 openmpi/3.0.1 From 706d0e947a2d4ed57d9af26f9b7e91b52bf0b87c Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:26:28 +0200 Subject: [PATCH 25/43] directory 'openmpi/3.0' renamed to 'openmpi/3'; gnuplot variants moved to 'files' directory --- Compiler/openmpi/{3.0 => 3}/variants.Darwin | 0 Compiler/openmpi/{3.0 => 3}/variants.Linux | 0 Tools/gnuplot/{5 => files}/variants | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename Compiler/openmpi/{3.0 => 3}/variants.Darwin (100%) rename Compiler/openmpi/{3.0 => 3}/variants.Linux (100%) rename Tools/gnuplot/{5 => files}/variants (100%) diff --git a/Compiler/openmpi/3.0/variants.Darwin b/Compiler/openmpi/3/variants.Darwin similarity index 100% rename from Compiler/openmpi/3.0/variants.Darwin rename to Compiler/openmpi/3/variants.Darwin diff --git a/Compiler/openmpi/3.0/variants.Linux b/Compiler/openmpi/3/variants.Linux similarity index 100% rename from Compiler/openmpi/3.0/variants.Linux rename to Compiler/openmpi/3/variants.Linux diff --git a/Tools/gnuplot/5/variants b/Tools/gnuplot/files/variants similarity index 100% rename from Tools/gnuplot/5/variants rename to Tools/gnuplot/files/variants From 70479b687afceb2fe2e26d0f4b0ffe1c564c755c Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:33:30 +0200 Subject: [PATCH 26/43] emacs: '25/variants' moved to 'files/variants' and version 26.1 added --- Tools/emacs/25/variants | 2 -- Tools/emacs/files/variants | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 Tools/emacs/25/variants create mode 100644 Tools/emacs/files/variants diff --git a/Tools/emacs/25/variants b/Tools/emacs/25/variants deleted file mode 100644 index c131366..0000000 --- a/Tools/emacs/25/variants +++ /dev/null @@ -1,2 +0,0 @@ -emacs/25.1 stable b:libungif/4.1.4 b:tiff/4.0.3 -emacs/25.3 stable b:libungif/4.1.4 b:tiff/4.0.9 diff --git a/Tools/emacs/files/variants b/Tools/emacs/files/variants new file mode 100644 index 0000000..3a44157 --- /dev/null +++ b/Tools/emacs/files/variants @@ -0,0 +1,3 @@ +emacs/25.1 stable b:libungif/4.1.4 b:tiff/4.0.3 +emacs/25.3 stable b:libungif/4.1.4 b:tiff/4.0.9 +emacs/26.1 stable b:libungif/4.1.4 b:tiff/4.0.9 From 4a86bd5aa49f69651008971a8c992396c63345f4 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:34:48 +0200 Subject: [PATCH 27/43] gnuplot: change shebang of modulefile to '#%PModule' --- Tools/gnuplot/modulefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/gnuplot/modulefile b/Tools/gnuplot/modulefile index 1ec2118..e1052c8 100644 --- a/Tools/gnuplot/modulefile +++ b/Tools/gnuplot/modulefile @@ -1,4 +1,4 @@ -#%Module1.0 +#%PModule module-whatis "portable command-line driven graphing utility" module-url "http://www.gnuplot.info/" From 5e318adcb31a0ea0bbb7a763ca09872ce0fd9d84 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:36:49 +0200 Subject: [PATCH 28/43] refactor variable names according to changes in Pmodules/0.99.15 in build-scripts of group 'Tools' --- Tools/asciidoc/build | 2 +- Tools/emacs/build | 8 ++++---- Tools/git/build | 8 ++++---- Tools/global/build | 2 +- Tools/gnuplot/build | 11 ++--------- Tools/openssl/build | 2 +- Tools/swig/build | 2 +- Tools/vim/build | 4 ++-- Tools/xmlto/build | 2 +- 9 files changed, 17 insertions(+), 24 deletions(-) diff --git a/Tools/asciidoc/build b/Tools/asciidoc/build index f674122..d8ddcdb 100755 --- a/Tools/asciidoc/build +++ b/Tools/asciidoc/build @@ -3,7 +3,7 @@ SOURCE_URL="https://sourceforge.net/projects/asciidoc/files/$P/$V/$P-$V.tar.gz" pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/Tools/emacs/build b/Tools/emacs/build index 498d23b..629ec5a 100755 --- a/Tools/emacs/build +++ b/Tools/emacs/build @@ -20,7 +20,7 @@ Linux ) esac pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ ${configure_args} \ || exit 1 @@ -29,12 +29,12 @@ pbuild::configure() { pbuild::post_install() { mkdir -p "${PREFIX}/bin" - install -m 0755 "${BUILD_BLOCK_DIR}/Emacs" "${PREFIX}/bin" - install -m 0755 "${BUILD_BLOCK_DIR}/Emacsclient" "${PREFIX}/bin" + install -m 0755 "${BUILDBLOCK_DIR}/Emacs" "${PREFIX}/bin" + install -m 0755 "${BUILDBLOCK_DIR}/Emacsclient" "${PREFIX}/bin" } pbuild::post_install_Darwin() { - cp -a "${MODULE_BUILDDIR}/nextstep/Emacs.app" "${PREFIX}" + cp -a "${BUILD_DIR}/nextstep/Emacs.app" "${PREFIX}" } pbuild::add_to_group 'Tools' diff --git a/Tools/git/build b/Tools/git/build index e48a85e..716bad3 100755 --- a/Tools/git/build +++ b/Tools/git/build @@ -11,8 +11,8 @@ Darwin ) esac pbuild::configure() { - cd "${MODULE_SRCDIR}" - "${MODULE_SRCDIR}"/configure \ + cd "${SRC_DIR}" + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --with-tcltk \ --with-perl="${PERL_PREFIX}/bin/perl" \ @@ -20,14 +20,14 @@ pbuild::configure() { } pbuild::build() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" make make -C contrib/subtree prefix="${prefix}" } pbuild::install() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" make install make install-doc make -C contrib/subtree prefix="${PREFIX}" install diff --git a/Tools/global/build b/Tools/global/build index 7559a60..4d7bcd8 100755 --- a/Tools/global/build +++ b/Tools/global/build @@ -1,7 +1,7 @@ #!/usr/bin/env modbuild pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --with-pic=yes \ --with-included-ltdl \ diff --git a/Tools/gnuplot/build b/Tools/gnuplot/build index d774601..ce623c9 100755 --- a/Tools/gnuplot/build +++ b/Tools/gnuplot/build @@ -1,16 +1,9 @@ #!/usr/bin/env modbuild pbuild::add_to_group 'Tools' -pbuild::set_source_url "https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-$V.tar.gz" -pbuild::set_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README' -pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ - --prefix="${PREFIX}" \ - --with-gif=no \ - --with-tiff=no \ - || exit 1 -} +pbuild::set_download_url "https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-$V.tar.gz" +pbuild::set_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README' pbuild::make_all diff --git a/Tools/openssl/build b/Tools/openssl/build index bac18bc..2a0a769 100755 --- a/Tools/openssl/build +++ b/Tools/openssl/build @@ -12,7 +12,7 @@ pbuild::configure() { ;; esac export CFLAGS=-fPIC - "${MODULE_SRCDIR}"/Configure shared --prefix="${PREFIX}" ${target} \ + "${SRC_DIR}"/Configure shared --prefix="${PREFIX}" ${target} \ || exit 1 } diff --git a/Tools/swig/build b/Tools/swig/build index a8370dc..b3deeec 100755 --- a/Tools/swig/build +++ b/Tools/swig/build @@ -3,7 +3,7 @@ SOURCE_URL="https://sourceforge.net/projects/swig/files/$P/$P-$V/$P-$V.tar.gz" pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/Tools/vim/build b/Tools/vim/build index f9173c2..d36b411 100755 --- a/Tools/vim/build +++ b/Tools/vim/build @@ -4,8 +4,8 @@ SOURCE_URL="ftp://ftp.vim.org/pub/vim/unix/$P-$V.tar.bz2" pbuild::configure() { - cd "${MODULE_SRCDIR}" - "${MODULE_SRCDIR}"/configure \ + cd "${SRC_DIR}" + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --enable-pythoninterp=dynamic \ --enable-python3interp=dynamic \ diff --git a/Tools/xmlto/build b/Tools/xmlto/build index e2874b9..ab1861a 100755 --- a/Tools/xmlto/build +++ b/Tools/xmlto/build @@ -3,7 +3,7 @@ SOURCE_URL="https://releases.pagure.org/$P/$P-$V.tar.bz2" pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } From 0d17f4f28bc52e182bb98b2863306b7f2df42907 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:42:07 +0200 Subject: [PATCH 29/43] refactor variable names according to changes in Pmodules/0.99.15 in build-scripts of group 'System' --- System/filebench/build | 2 +- System/fsstress/build | 4 ++-- System/mdtest/build | 4 ++-- System/nmap/build | 6 +++--- System/patchelf/build | 2 +- System/unison/build | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/System/filebench/build b/System/filebench/build index e808006..33b8d6a 100755 --- a/System/filebench/build +++ b/System/filebench/build @@ -1,7 +1,7 @@ #!/usr/bin/env modbuild pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/System/fsstress/build b/System/fsstress/build index ef35e01..8373e14 100755 --- a/System/fsstress/build +++ b/System/fsstress/build @@ -5,13 +5,13 @@ pbuild::configure() { } pbuild::build() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" make -j ${JOBS} } pbuild::install() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" mkdir -p ${PREFIX}/bin install -m 0755 fsstress "${PREFIX}/bin" } diff --git a/System/mdtest/build b/System/mdtest/build index 9b8d4d8..afd039e 100755 --- a/System/mdtest/build +++ b/System/mdtest/build @@ -5,13 +5,13 @@ pbuild::configure() { } pbuild::build() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" make -j ${JOBS} } pbuild::install() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" mkdir -p ${PREFIX}/bin install -m 0755 mdtest "${PREFIX}/bin" } diff --git a/System/nmap/build b/System/nmap/build index 3e540a9..68f991c 100755 --- a/System/nmap/build +++ b/System/nmap/build @@ -1,7 +1,7 @@ #!/usr/bin/env modbuild pbuild::configure() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" ./configure \ --prefix="${PREFIX}" \ --with-libpcap=included \ @@ -12,12 +12,12 @@ pbuild::configure() { } pbuild::build() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" make -j "${JOBS}" } pbuild::install() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" make install } diff --git a/System/patchelf/build b/System/patchelf/build index e808006..33b8d6a 100755 --- a/System/patchelf/build +++ b/System/patchelf/build @@ -1,7 +1,7 @@ #!/usr/bin/env modbuild pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/System/unison/build b/System/unison/build index c23dfd0..03f6634 100755 --- a/System/unison/build +++ b/System/unison/build @@ -5,12 +5,12 @@ pbuild::configure() { } pbuild::build() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" make } pbuild::install() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" install -m 0755 -d "${PREFIX}/bin" install -m 0755 unison "${PREFIX}/bin" } From b674162f071a31d6a3c1454aedbc7044942e4e2a Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:44:10 +0200 Subject: [PATCH 30/43] cctools added, still work in progress --- Programming/cctools/build | 26 +++++++++ Programming/cctools/files/PR-12400897.patch | 35 ++++++++++++ Programming/cctools/files/PR-37520.patch | 55 +++++++++++++++++++ .../cctools/files/cctools-829-lto.patch | 39 +++++++++++++ .../files/cctools-839-static-dis_info.patch | 22 ++++++++ .../cctools/files/cctools-862-prunetrie.patch | 34 ++++++++++++ .../cctools-895-OFILE_LLVM_BITCODE.patch | 18 ++++++ .../files/cctools-895-big_endian.patch | 12 ++++ Programming/cctools/files/not-clang.patch | 12 ++++ .../cctools/files/snowleopard-strnlen.patch | 21 +++++++ Programming/cctools/files/variants | 1 + 11 files changed, 275 insertions(+) create mode 100755 Programming/cctools/build create mode 100644 Programming/cctools/files/PR-12400897.patch create mode 100644 Programming/cctools/files/PR-37520.patch create mode 100644 Programming/cctools/files/cctools-829-lto.patch create mode 100644 Programming/cctools/files/cctools-839-static-dis_info.patch create mode 100644 Programming/cctools/files/cctools-862-prunetrie.patch create mode 100644 Programming/cctools/files/cctools-895-OFILE_LLVM_BITCODE.patch create mode 100644 Programming/cctools/files/cctools-895-big_endian.patch create mode 100644 Programming/cctools/files/not-clang.patch create mode 100644 Programming/cctools/files/snowleopard-strnlen.patch create mode 100644 Programming/cctools/files/variants diff --git a/Programming/cctools/build b/Programming/cctools/build new file mode 100755 index 0000000..b280e4b --- /dev/null +++ b/Programming/cctools/build @@ -0,0 +1,26 @@ +#!/usr/bin/env modbuild +# +# :FIXME: this is work in progress! +# +pbuild::add_to_group 'Programming' +pbuild::set_download_url "https://opensource.apple.com/tarballs/cctools/$P-$V.tar.gz" +pbuild::compile_in_sourcetree + +pbuild::set_default_patch_strip 0 +pbuild::add_patch 'files/PR-12400897.patch' +pbuild::add_patch 'files/PR-37520.patch' +pbuild::add_patch 'files/cctools-829-lto.patch' +pbuild::add_patch 'files/cctools-839-static-dis_info.patch' +pbuild::add_patch 'files/cctools-862-prunetrie.patch' +pbuild::add_patch 'files/cctools-895-OFILE_LLVM_BITCODE.patch' +pbuild::add_patch 'files/cctools-895-big_endian.patch' +pbuild::add_patch 'files/not-clang.patch' + +#pbuild::set_docfiles 'COPYING' 'COPYING.LIB' 'COPYING.RUNTIME' 'COPYING3' 'COPYING3.LIB' 'NEWS' 'README' + +pbuild::configure() { + : +} + +pbuild::make_all + diff --git a/Programming/cctools/files/PR-12400897.patch b/Programming/cctools/files/PR-12400897.patch new file mode 100644 index 0000000..8a2ac50 --- /dev/null +++ b/Programming/cctools/files/PR-12400897.patch @@ -0,0 +1,35 @@ +--- misc/nm.c 1969-12-31 16:00:00.000000000 -0800 ++++ misc/nm.c 2012-09-29 12:36:22.000000000 -0700 +@@ -496,7 +496,7 @@ void *cookie) + uint32_t nsymbols; + struct value_diff *value_diffs; + +- char *short_name, *has_suffix; ++ char *short_name, *suffix; + enum bool is_framework; + + cmd_flags = (struct cmd_flags *)cookie; +@@ -650,9 +650,20 @@ void *cookie) + process_flags.lib_names[j] = + (char *)dl + dl->dylib.name.offset; + short_name = guess_short_name(process_flags.lib_names[j], +- &is_framework, &has_suffix); +- if(short_name != NULL) +- process_flags.lib_names[j] = short_name; ++ &is_framework, &suffix); ++ if(short_name != NULL) { ++ if (suffix) { ++ char *combined_name; ++ asprintf(&combined_name, "%s%s", short_name, suffix); ++ if (combined_name) { ++ process_flags.lib_names[j] = combined_name; ++ free(short_name); ++ free(suffix); ++ } ++ } else { ++ process_flags.lib_names[j] = short_name; ++ } ++ } + j++; + } + lc = (struct load_command *) diff --git a/Programming/cctools/files/PR-37520.patch b/Programming/cctools/files/PR-37520.patch new file mode 100644 index 0000000..fcac838 --- /dev/null +++ b/Programming/cctools/files/PR-37520.patch @@ -0,0 +1,55 @@ +--- as/ppc.c.orig 2013-01-04 10:39:49.000000000 +0100 ++++ as/ppc.c 2013-01-04 10:40:02.000000000 +0100 +@@ -1019,6 +1019,8 @@ char *op) + + /* if this instruction requires labels mark it for later */ + switch(insn.reloc){ ++ case NO_RELOC: ++ break; + case PPC_RELOC_HI16: + case PPC_RELOC_LO16: + case PPC_RELOC_HA16: +@@ -1033,6 +1035,7 @@ char *op) + insn.reloc); + break; + case PPC_RELOC_BR14: ++ case PPC_RELOC_BR14_predicted: + fix_new(frag_now, + thisfrag - frag_now->fr_literal, + 4, +--- as/m88k.c.orig 1969-12-31 16:00:00.000000000 -0800 ++++ as/m88k.c 2013-07-05 10:32:19.000000000 -0700 +@@ -600,6 +600,10 @@ char *op) + + /* if this instruction requires labels mark it for later */ + switch (insn.reloc) { ++ ++ case NO_RELOC: ++ break; ++ + case M88K_RELOC_LO16: + case M88K_RELOC_HI16: + fix_new( +--- as/sparc.c.orig 1969-12-31 16:00:00.000000000 -0800 ++++ as/sparc.c 2013-07-05 10:32:14.000000000 -0700 +@@ -851,6 +851,20 @@ sparc_ip (str) + /* plug absolutes directly into opcode */ + + switch(the_insn.reloc) { ++ case SPARC_RELOC_13: ++ if (the_insn.exp.X_seg == SEG_BIG) ++ opcode |= (*(int *) generic_bignum) & 0x1fff; ++ else ++ opcode |= the_insn.exp.X_add_number & 0x1fff; ++ the_insn.reloc = SPARC_RELOC_NONE; ++ break; ++ case SPARC_RELOC_22: ++ if (the_insn.exp.X_seg == SEG_BIG) ++ opcode |= (*(int *) generic_bignum) & 0x3fffff; ++ else ++ opcode |= the_insn.exp.X_add_number & 0x3fffff; ++ the_insn.reloc = SPARC_RELOC_NONE; ++ break; + case SPARC_RELOC_HI22: + /* extract upper 22 bits from constant */ + opcode |= (the_insn.exp.X_add_number >> 10) & 0x3fffff; diff --git a/Programming/cctools/files/cctools-829-lto.patch b/Programming/cctools/files/cctools-829-lto.patch new file mode 100644 index 0000000..79c811a --- /dev/null +++ b/Programming/cctools/files/cctools-829-lto.patch @@ -0,0 +1,39 @@ +--- libstuff/lto.c.orig 1969-12-31 16:00:00.000000000 -0800 ++++ libstuff/lto.c 2012-09-04 14:59:31.000000000 -0700 +@@ -112,13 +112,21 @@ void **pmod) /* maybe NULL */ + lto_path = makestr(prefix, "../lib/libLTO.dylib", NULL); + + lto_handle = dlopen(lto_path, RTLD_NOW); ++ free(lto_path); ++ lto_path = NULL; + if(lto_handle == NULL){ +- free(lto_path); +- lto_path = NULL; +- lto_handle = dlopen("/Applications/Xcode.app/Contents/" +- "Developer/Toolchains/XcodeDefault." +- "xctoolchain/usr/lib/libLTO.dylib", +- RTLD_NOW); ++ const char *lto_paths[] = { ++ "@@LLVM_LIBDIR@@/libLTO.dylib", ++ "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/libLTO.dylib", ++ "/usr/lib/libLTO.dylib", ++ "/Applications/Xcode.app/usr/lib/libLTO.dylib", ++ "/Developer/usr/lib/libLTO.dylib", ++ NULL ++ }; ++ const char **p; ++ for(p = lto_paths; *p && !lto_handle ; p++) { ++ lto_handle = dlopen(*p, RTLD_NOW); ++ } + } + if(lto_handle == NULL) + return(0); +@@ -142,8 +150,6 @@ void **pmod) /* maybe NULL */ + lto_get_sym_attr == NULL || + lto_get_sym_name == NULL){ + dlclose(lto_handle); +- if(lto_path != NULL) +- free(lto_path); + return(0); + } + } diff --git a/Programming/cctools/files/cctools-839-static-dis_info.patch b/Programming/cctools/files/cctools-839-static-dis_info.patch new file mode 100644 index 0000000..3a490ce --- /dev/null +++ b/Programming/cctools/files/cctools-839-static-dis_info.patch @@ -0,0 +1,22 @@ +--- otool/arm_disasm.c.orig 2013-08-29 14:23:24.000000000 -0700 ++++ otool/arm_disasm.c 2013-08-29 14:23:51.000000000 -0700 +@@ -62,7 +62,7 @@ typedef char bfd_byte; + + /* HACKS to avoid pulling in all of FSF binutils include/dis-asm.h */ + typedef int (*fprintf_ftype) (void *, const char*, ...); +-struct disassemble_info { /* HACK'ed up for just what we need here */ ++static struct disassemble_info { /* HACK'ed up for just what we need here */ + fprintf_ftype fprintf_func; + void *stream; + +--- otool/i386_disasm.c.orig 2013-08-29 14:23:19.000000000 -0700 ++++ otool/i386_disasm.c 2013-08-29 14:24:00.000000000 -0700 +@@ -1600,7 +1600,7 @@ static unsigned int xmm_rm(int r_m, int + /* + * This is passed to the llvm disassembler. + */ +-struct disassemble_info { ++static struct disassemble_info { + enum bool verbose; + /* Relocation information. */ + struct relocation_info *sorted_relocs; diff --git a/Programming/cctools/files/cctools-862-prunetrie.patch b/Programming/cctools/files/cctools-862-prunetrie.patch new file mode 100644 index 0000000..ebe7d9a --- /dev/null +++ b/Programming/cctools/files/cctools-862-prunetrie.patch @@ -0,0 +1,34 @@ +--- misc/Makefile.orig 2015-01-10 20:43:30.000000000 -0800 ++++ misc/Makefile 2015-01-10 20:51:27.000000000 -0800 +@@ -201,14 +201,18 @@ indr.NEW: indr.o + $(OFILE_DIR)/indr.private.o + $(DSYMUTIL) $(SYMROOT)/indr.NEW + +-strip.NEW: strip.o ++strip.NEW: strip.o PruneTrie.o + $(CC) $(RC_CFLAGS) -nostdlib -r \ + -o $(OBJROOT)/strip.private.o \ + $(OFILE_DIR)/strip.o $(LIBSTUFF) + $(CXX) $(RC_CFLAGS) $(SDK) -o $(SYMROOT)/strip.NEW \ +- $(OFILE_DIR)/strip.private.o $(LIB_PRUNETRIE) $(CXXLIB) ++ $(OFILE_DIR)/strip.private.o $(OFILE_DIR)/PruneTrie.o $(CXXLIB) + $(DSYMUTIL) $(SYMROOT)/strip.NEW + ++PruneTrie.o: PruneTrie.cpp ++ $(CXX) $(CXXFLAGS) $(RC_CFLAGS) $(SDK) $(CXXLIB) -c -o \ ++ $(OBJROOT)/PruneTrie.o $(SRCROOT)/PruneTrie.cpp ++ + nmedit.NEW: nmedit.o + $(CC) $(RC_CFLAGS) -nostdlib -r \ + -o $(OBJROOT)/nmedit.private.o \ +--- misc/strip.c.orig 2015-01-10 21:25:17.000000000 -0800 ++++ misc/strip.c 2015-01-10 21:25:40.000000000 -0800 +@@ -47,7 +47,7 @@ + #include "stuff/unix_standard_mode.h" + #include "stuff/execute.h" + #ifdef TRIE_SUPPORT +-#include ++#include "prune_trie.h" + #endif /* TRIE_SUPPORT */ + + /* These are set from the command line arguments */ diff --git a/Programming/cctools/files/cctools-895-OFILE_LLVM_BITCODE.patch b/Programming/cctools/files/cctools-895-OFILE_LLVM_BITCODE.patch new file mode 100644 index 0000000..c137e4c --- /dev/null +++ b/Programming/cctools/files/cctools-895-OFILE_LLVM_BITCODE.patch @@ -0,0 +1,18 @@ +--- misc/strings.c-orig 2016-12-09 19:03:02.000000000 +0100 ++++ misc/strings.c 2016-12-23 10:35:34.000000000 +0100 +@@ -335,8 +335,13 @@ + * If the ofile is not an object file then process it without reguard + * to sections. + */ +- if(ofile->object_addr == NULL || ofile->member_type == OFILE_LLVM_BITCODE){ +- if(ofile->file_type == OFILE_FAT && ofile->arch_flag.cputype != 0){ ++ if(ofile->object_addr == NULL ++#ifdef LTO_SUPPORT ++ || ofile->member_type == OFILE_LLVM_BITCODE){ ++#else ++ ){ ++#endif /* LTO_SUPPORT */ ++ if(ofile->file_type == OFILE_FAT && ofile->arch_flag.cputype != 0){ + if(ofile->fat_header->magic == FAT_MAGIC_64){ + addr = ofile->file_addr + + ofile->fat_archs64[ofile->narch].offset; diff --git a/Programming/cctools/files/cctools-895-big_endian.patch b/Programming/cctools/files/cctools-895-big_endian.patch new file mode 100644 index 0000000..92aa091 --- /dev/null +++ b/Programming/cctools/files/cctools-895-big_endian.patch @@ -0,0 +1,12 @@ +--- libstuff/ofile.c- 2016-12-16 11:53:10.000000000 -0500 ++++ libstuff/ofile.c 2016-12-16 11:53:41.000000000 -0500 +@@ -3423,7 +3423,7 @@ + if(size - offset > sizeof(uint32_t)){ + memcpy(&magic, addr + offset, sizeof(uint32_t)); + #ifdef __BIG_ENDIAN__ +- if(magic == FAT_MAGIC || (magic == FAT_MAGIC_64) ++ if(magic == FAT_MAGIC || magic == FAT_MAGIC_64) + #endif /* __BIG_ENDIAN__ */ + #ifdef __LITTLE_ENDIAN__ + if(magic == SWAP_INT(FAT_MAGIC) || + diff --git a/Programming/cctools/files/not-clang.patch b/Programming/cctools/files/not-clang.patch new file mode 100644 index 0000000..6db44a2 --- /dev/null +++ b/Programming/cctools/files/not-clang.patch @@ -0,0 +1,12 @@ +--- as/driver.c.orig 2015-11-23 21:01:45.000000000 -0800 ++++ as/driver.c 2015-11-23 21:09:24.000000000 -0800 +@@ -280,6 +280,9 @@ char **envp) + arch_flag.cputype == CPU_TYPE_ARM) + run_clang = 1; + ++ /* MACPORTS: Don't use the clang assembler for now. */ ++ run_clang = 0; ++ + /* + * Use the clang as the assembler if is the default or asked to with + * the -q flag. But don't use it asked to use the system assembler diff --git a/Programming/cctools/files/snowleopard-strnlen.patch b/Programming/cctools/files/snowleopard-strnlen.patch new file mode 100644 index 0000000..80e3b82 --- /dev/null +++ b/Programming/cctools/files/snowleopard-strnlen.patch @@ -0,0 +1,21 @@ +--- otool/ofile_print.c.orig 2013-11-10 22:33:14.000000000 -0800 ++++ otool/ofile_print.c 2013-11-10 22:34:19.000000000 -0800 +@@ -225,6 +225,18 @@ + #include "stuff/guess_short_name.h" + #include "ofile_print.h" + ++static size_t ++strnlen(const char *s, size_t maxlen) ++{ ++ size_t len; ++ ++ for (len = 0; len < maxlen; len++, s++) { ++ if (!*s) ++ break; ++ } ++ return (len); ++} ++ + /* */ + /* The maximum section alignment allowed to be specified, as a power of two */ + #define MAXSECTALIGN 15 /* 2**15 or 0x8000 */ diff --git a/Programming/cctools/files/variants b/Programming/cctools/files/variants new file mode 100644 index 0000000..1bfef38 --- /dev/null +++ b/Programming/cctools/files/variants @@ -0,0 +1 @@ +ctools/895 unstable From 0f6f00e751b4d8551cefd5167a9dd9115b506fb8 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:44:26 +0200 Subject: [PATCH 31/43] refactor variable names according to changes in Pmodules/0.99.15 in build-scripts of group 'Programming' --- Programming/Python/build | 4 ++-- Programming/Tcl/build | 4 ++-- Programming/Tk/build | 4 ++-- Programming/autoconf/build | 2 +- Programming/automake/build | 2 +- Programming/binutils/build | 2 +- Programming/cmake/build | 2 +- Programming/gcc/build | 8 ++++---- Programming/ld64/build | 26 +++++++++++++------------- Programming/libtool/build | 2 +- Programming/m4/build | 2 +- Programming/perl/build | 2 +- Programming/psi-python27/build | 2 +- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Programming/Python/build b/Programming/Python/build index 285291d..e825c75 100755 --- a/Programming/Python/build +++ b/Programming/Python/build @@ -8,7 +8,7 @@ pbuild::configure() { export LDFLAGS="-L${OPENSSL_LIBRARY_DIR}" export CPPFLAGS="-fPIC -I${OPENSSL_INCLUDE_DIR} -I${OPENSSL_INCLUDE_DIR}/openssl" export LD_LIBRARY_PATH+=":${PREFIX}/lib" - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --enable-shared \ || exit 1 @@ -22,7 +22,7 @@ pbuild::post_install() { ln -fs "${PREFIX}/include/python${V%.*}m" "${PREFIX}/include/python" ln -fs "${PREFIX}/include/python${V%.*}m" "${PREFIX}/include/python${V%.*}" PATH+=":${PREFIX}/bin" - cd "${BUILD_BLOCK_DIR}" + cd "${BUILDBLOCK_DIR}" "${PREFIX}/bin/python" 'get-pip.py' pip${V_MAJOR} install numpy pip${V_MAJOR} install scipy diff --git a/Programming/Tcl/build b/Programming/Tcl/build index 1c84723..27153b8 100755 --- a/Programming/Tcl/build +++ b/Programming/Tcl/build @@ -5,10 +5,10 @@ SOURCE_URL="ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl$V-src.tar.gz" pbuild::configure() { case ${OS} in Linux ) - srcdir="${MODULE_SRCDIR}/unix" + srcdir="${SRC_DIR}/unix" ;; Darwin ) - srcdir="${MODULE_SRCDIR}/macosx" + srcdir="${SRC_DIR}/macosx" ;; esac "${srcdir}"/configure \ diff --git a/Programming/Tk/build b/Programming/Tk/build index c80934c..f87b5c1 100755 --- a/Programming/Tk/build +++ b/Programming/Tk/build @@ -5,10 +5,10 @@ SOURCE_URL="ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tk$V-src.tar.gz" pbuild::configure() { case ${OS} in Linux ) - srcdir="${MODULE_SRCDIR}/unix" + srcdir="${SRC_DIR}/unix" ;; Darwin ) - srcdir="${MODULE_SRCDIR}/macosx" + srcdir="${SRC_DIR}/macosx" C_INCLUDE_PATH+=":/opt/local/include" LIBRARY_PATH+=":/opt/local/lib" ;; diff --git a/Programming/autoconf/build b/Programming/autoconf/build index 076c0dd..fc524d7 100755 --- a/Programming/autoconf/build +++ b/Programming/autoconf/build @@ -3,7 +3,7 @@ SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz" pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/Programming/automake/build b/Programming/automake/build index 411202b..3ea671e 100755 --- a/Programming/automake/build +++ b/Programming/automake/build @@ -3,7 +3,7 @@ SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz" pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/Programming/binutils/build b/Programming/binutils/build index 7cb8510..24b1ccd 100755 --- a/Programming/binutils/build +++ b/Programming/binutils/build @@ -3,7 +3,7 @@ SOURCE_URL="http://ftp.gnu.org/gnu/binutils/$P-$V.tar.gz" pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/Programming/cmake/build b/Programming/cmake/build index 1dc4bb3..0724794 100755 --- a/Programming/cmake/build +++ b/Programming/cmake/build @@ -11,7 +11,7 @@ Darwin ) esac pbuild::configure() { - "${MODULE_SRCDIR}/bootstrap" --prefix="${PREFIX}" ${bootstrap_flags} --verbose + "${SRC_DIR}/bootstrap" --prefix="${PREFIX}" ${bootstrap_flags} --verbose } pbuild::add_to_group 'Programming' diff --git a/Programming/gcc/build b/Programming/gcc/build index b937a29..be0bd11 100755 --- a/Programming/gcc/build +++ b/Programming/gcc/build @@ -5,11 +5,11 @@ SOURCE_URL="https://ftp.gnu.org/gnu/gcc/$P-$V/$P-$V.tar.gz" pbuild::patch_sources_Darwin() { if (( V_MAJOR == 4 && V_MINOR <= 8 )) || \ (( V_MAJOR == 4 && V_MINOR == 9 && V_PATCHLVL < 4)); then - patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/non-dead-strip.patch" - patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/configure-as.patch" + patch -p1 < "${BUILDBLOCK_DIR}/${V_MAJOR}/non-dead-strip.patch" + patch -p1 < "${BUILDBLOCK_DIR}/${V_MAJOR}/configure-as.patch" fi if (( V_MAJOR == 5 )) || (( V_MAJOR == 6 )); then - patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/PR57438_avoiding_empty_function_bodies_and_trailing_labels.patch" + patch -p1 < "${BUILDBLOCK_DIR}/${V_MAJOR}/PR57438_avoiding_empty_function_bodies_and_trailing_labels.patch" fi } @@ -45,7 +45,7 @@ pbuild::configure() { echo "Unsupported OS '${OS}'!" ;; esac - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ "${conf_args[@]}" \ || exit 1 diff --git a/Programming/ld64/build b/Programming/ld64/build index 7470141..593fb4b 100755 --- a/Programming/ld64/build +++ b/Programming/ld64/build @@ -11,12 +11,12 @@ DYLD_SOURCE_URL="http://opensource.apple.com/tarballs/dyld/dyld-${DYLD_VERSION}. pbuild::patch_sources () { find_patchdir() { local -a patchdirs=() - patchdirs+=( "${BUILD_BLOCK_DIR}/${V}/patches.${OS}" ) - patchdirs+=( "${BUILD_BLOCK_DIR}/${V}/patches" ) - patchdirs+=( "${BUILD_BLOCK_DIR}/${V%.*}/patches.${OS}" ) - patchdirs+=( "${BUILD_BLOCK_DIR}/${V%.*}/patches" ) - patchdirs+=( "${BUILD_BLOCK_DIR}/${V%.*.*}/patches.${OS}" ) - patchdirs+=( "${BUILD_BLOCK_DIR}/${V%.*.*}/patches" ) + patchdirs+=( "${BUILDBLOCK_DIR}/${V}/patches.${OS}" ) + patchdirs+=( "${BUILDBLOCK_DIR}/${V}/patches" ) + patchdirs+=( "${BUILDBLOCK_DIR}/${V%.*}/patches.${OS}" ) + patchdirs+=( "${BUILDBLOCK_DIR}/${V%.*}/patches" ) + patchdirs+=( "${BUILDBLOCK_DIR}/${V%.*.*}/patches.${OS}" ) + patchdirs+=( "${BUILDBLOCK_DIR}/${V%.*.*}/patches" ) for patchdir in "${patchdirs[@]}"; do [[ -e "${patchdir}" ]] && return 0; @@ -32,8 +32,8 @@ pbuild::patch_sources () { } pbuild::post_prep() { - local -r DYLD_SRC_DIR="${PMODULES_TMPDIR}/dyld-${DYLD_VERSION}/src" - local -r CCTOOLS_SRC_DIR="${PMODULES_TMPDIR}/cctools-${CCTOOLS_VERSION}/src" + local -r DYLD_SRC_DIR="${TEMP_DIR}/dyld-${DYLD_VERSION}/src" + local -r CCTOOLS_SRC_DIR="${TEMP_DIR}/cctools-${CCTOOLS_VERSION}/src" local source_file='' pbuild::get_source source_file "${DYLD_SOURCE_URL}" "${PMODULES_DISTFILESDIR}" || @@ -44,21 +44,21 @@ pbuild::post_prep() { std::die 4 "cctools/${CCTOOLS_VERSION}: sourcecode not found." pbuild::unpack "${source_file}" "${CCTOOLS_SRC_DIR}" - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" mkdir -p "include/mach-o" rsync --archive "../../cctools-${CCTOOLS_VERSION}/src/include/mach-o/" "include/mach-o/" rsync --archive "../../dyld-${DYLD_VERSION}/src/include/mach-o/" "include/mach-o/" mkdir -p "include/llvm-c" - cp -v "${BUILD_BLOCK_DIR}/files/Disassembler.h" "include/llvm-c/" - cp -v "${BUILD_BLOCK_DIR}/files/lto.h" "include/llvm-c/" + cp -v "${BUILDBLOCK_DIR}/files/Disassembler.h" "include/llvm-c/" + cp -v "${BUILDBLOCK_DIR}/files/lto.h" "include/llvm-c/" } pbuild::configure() { - cp -v "${BUILD_BLOCK_DIR}/files/Makefile-${V_MAJOR}" "${MODULE_SRCDIR}/Makefile" + cp -v "${BUILDBLOCK_DIR}/files/Makefile-${V_MAJOR}" "${SRC_DIR}/Makefile" } pbuild::build() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" which $CC make OTHER_CXXFLAGS="-std=c++11 -I$PWD/include" OTHER_LDFLAGS="-L/Applications/Xcode.app/Contents/Frameworks -lLTO" } diff --git a/Programming/libtool/build b/Programming/libtool/build index d665f46..bd6b4a4 100755 --- a/Programming/libtool/build +++ b/Programming/libtool/build @@ -3,7 +3,7 @@ SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz" pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/Programming/m4/build b/Programming/m4/build index 67ecec0..72ac9f1 100755 --- a/Programming/m4/build +++ b/Programming/m4/build @@ -3,7 +3,7 @@ SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.bz2" pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/Programming/perl/build b/Programming/perl/build index 3cdf58e..cc23028 100755 --- a/Programming/perl/build +++ b/Programming/perl/build @@ -3,7 +3,7 @@ SOURCE_URL="http://www.cpan.org/src/5.0/$P-$V.tar.gz" pbuild::configure() { - "${MODULE_SRCDIR}"/configure.gnu \ + "${SRC_DIR}"/configure.gnu \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/Programming/psi-python27/build b/Programming/psi-python27/build index 5e6ab6e..47c4b6d 100755 --- a/Programming/psi-python27/build +++ b/Programming/psi-python27/build @@ -9,7 +9,7 @@ pbuild::build() { } pbuild::install() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" rsync --exclude=".info" --delete --verbose --archive . "${PREFIX}" } From 93d38b3daa1b5dc97466cffaec207fced617b122 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:46:33 +0200 Subject: [PATCH 32/43] opt-pilot/README.md added --- OPAL/opt-pilot/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 OPAL/opt-pilot/README.md diff --git a/OPAL/opt-pilot/README.md b/OPAL/opt-pilot/README.md new file mode 100644 index 0000000..5ff339d --- /dev/null +++ b/OPAL/opt-pilot/README.md @@ -0,0 +1 @@ +This build-block is obsolete! opt-pilot has been integrated into OPAL. From a1b9c0b9cd40d24243591ac64917eec5489f2c7c Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:47:01 +0200 Subject: [PATCH 33/43] refactor variable names according to changes in Pmodules/0.99.15 in build-scripts of group 'OPAL' --- OPAL/opt-pilot/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OPAL/opt-pilot/build b/OPAL/opt-pilot/build index eab6cb3..6561d7d 100755 --- a/OPAL/opt-pilot/build +++ b/OPAL/opt-pilot/build @@ -11,7 +11,7 @@ pbuild::configure() { -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_BUILD_TYPE=RELEASE \ "${configure_args[@]}" \ - "${MODULE_SRCDIR}" || std::die 1 "cmake failed" + "${SRC_DIR}" || std::die 1 "cmake failed" } pbuild::add_to_group 'OPAL' From f62924c8f3baf692010cf0b0bcfac647a5835a5a Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:48:35 +0200 Subject: [PATCH 34/43] openmpi/3.0.0 with gcc/7.3.0 released as stable --- Compiler/openmpi/3/variants.Darwin | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Compiler/openmpi/3/variants.Darwin b/Compiler/openmpi/3/variants.Darwin index b1a6180..12d3bfd 100644 --- a/Compiler/openmpi/3/variants.Darwin +++ b/Compiler/openmpi/3/variants.Darwin @@ -1 +1,3 @@ -openmpi/3.0.0 unstable gcc/7.3.0 +openmpi/3.0.0 stable gcc/7.3.0 +openmpi/3.0.2 stable gcc/7.3.0 +openmpi/3.1.1 stable gcc/7.3.0 From b53aaf92a5e08d8573d9178320d3f20f7e1e034e Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:49:03 +0200 Subject: [PATCH 35/43] refactor variable names according to changes in Pmodules/0.99.15 in build-scripts of group 'Compiler' --- Compiler/H5root/build | 4 ++-- Compiler/OpenBLAS/build | 12 ++++++------ Compiler/OpenBLAS_OMP/build | 6 +++--- Compiler/SuperLU/build | 8 ++++---- Compiler/UMFPACK/build | 6 +++--- Compiler/atlas/build | 2 +- Compiler/boost/build | 14 +++++++------- Compiler/clapack/build | 6 +++--- Compiler/eigen3/build | 2 +- Compiler/gsl/build | 2 +- Compiler/gtest/build | 4 ++-- Compiler/hdf5_serial/build | 2 +- Compiler/mpich/build | 2 +- Compiler/openmpi/build | 2 +- Compiler/roger/build | 2 +- Compiler/root/build | 2 +- Compiler/vtk/build | 2 +- 17 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Compiler/H5root/build b/Compiler/H5root/build index a837472..f217615 100755 --- a/Compiler/H5root/build +++ b/Compiler/H5root/build @@ -7,7 +7,7 @@ pbuild::post_prep() { } pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" } @@ -40,7 +40,7 @@ pbuild::post_install() { local sed_cmd="s:@PREFIX@:${PREFIX}:g;" sed_cmd+="s:@HDF5_PREFIX@:${HDF5_SERIAL_PREFIX}:g;" sed_cmd+="s:@ROOT_PREFIX@:${ROOT_PREFIX}:g;" - sed "${sed_cmd}" "${BUILD_BLOCK_DIR}/${V_MAJOR}/H5root" > "${PREFIX}/bin/H5root" + sed "${sed_cmd}" "${BUILDBLOCK_DIR}/${V_MAJOR}/H5root" > "${PREFIX}/bin/H5root" chmod 0755 "${PREFIX}/bin/H5root" # install serial HDF5 and H5hut header files diff --git a/Compiler/OpenBLAS/build b/Compiler/OpenBLAS/build index 12f2de1..152b226 100755 --- a/Compiler/OpenBLAS/build +++ b/Compiler/OpenBLAS/build @@ -17,17 +17,17 @@ pbuild::configure() { die 3 "Oops: unknown compiler: ${COMPILER}" ;; esac - cat < "${MODULE_SRCDIR}/make.inc" + cat < "${SRC_DIR}/make.inc" SHELL = /bin/sh PLAT = 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" - echo "USE_THREAD = 0" >> "${MODULE_SRCDIR}/Makefile.rule" - sed -i.bak "s/MACOSX_DEPLOYMENT_TARGET=.*/MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET/" "${MODULE_SRCDIR}/Makefile.system" + echo "USE_SIMPLE_THREADED_LEVEL3 = 1" >> "${SRC_DIR}/Makefile.rule" + echo "NO_AVX = 1" >> "${SRC_DIR}/Makefile.rule" + echo "NO_AVX2 = 1" >> "${SRC_DIR}/Makefile.rule" + echo "USE_THREAD = 0" >> "${SRC_DIR}/Makefile.rule" + sed -i.bak "s/MACOSX_DEPLOYMENT_TARGET=.*/MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET/" "${SRC_DIR}/Makefile.system" } pbuild::build() { diff --git a/Compiler/OpenBLAS_OMP/build b/Compiler/OpenBLAS_OMP/build index 60e3539..93a596d 100755 --- a/Compiler/OpenBLAS_OMP/build +++ b/Compiler/OpenBLAS_OMP/build @@ -1,14 +1,14 @@ #!/usr/bin/env modbuild pbuild::configure() { - cat < "${MODULE_SRCDIR}/make.inc" + cat < "${SRC_DIR}/make.inc" SHELL = /bin/sh PLAT = DRVOPTS = \$(OPTS) LOADER = \$(FORTRAN) -pthread ARCHFLAGS= -ru EOF - cat < "${MODULE_SRCDIR}/Makefile.rule" + cat < "${SRC_DIR}/Makefile.rule" VERSION = 0.2.9 TARGET = CORE2 CC = gcc @@ -24,7 +24,7 @@ EOF } pbuild::build() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" make } diff --git a/Compiler/SuperLU/build b/Compiler/SuperLU/build index 9136e86..db460da 100755 --- a/Compiler/SuperLU/build +++ b/Compiler/SuperLU/build @@ -4,7 +4,7 @@ SOURCE_URL="http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_$V.tar.gz" if (( V_MAJOR < 5 )); then pbuild::configure() { - cat < "${MODULE_SRCDIR}/make.inc" + cat < "${SRC_DIR}/make.inc" PLAT = SuperLUroot = \${PREFIX} SUPERLULIB = \$(SuperLUroot)/lib/libsuperlu.a @@ -30,7 +30,7 @@ EOF } else pbuild::configure() { - cmake "${MODULE_SRCDIR}" \ + cmake "${SRC_DIR}" \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ || exit 1 @@ -39,7 +39,7 @@ fi pbuild::build() { if (( V_MAJOR < 5 )); then - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" mkdir -p "${PREFIX}/lib" fi make @@ -48,7 +48,7 @@ pbuild::build() { pbuild::install() { make install mkdir -p "${PREFIX}/include" - install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include" + install -m 0444 "${SRC_DIR}"/SRC/*.h "${PREFIX}/include" } pbuild::add_to_group 'Compiler' diff --git a/Compiler/UMFPACK/build b/Compiler/UMFPACK/build index 13ee965..17ce52b 100755 --- a/Compiler/UMFPACK/build +++ b/Compiler/UMFPACK/build @@ -3,7 +3,7 @@ SOURCE_URL="file://$PMODULES_DISTFILESDIR/$P-V.tar.bz2" pbuild::configure() { - cat < "${MODULE_SRCDIR}/SuiteSparse_config/SuiteSparse_config.mk" + cat < "${SRC_DIR}/SuiteSparse_config/SuiteSparse_config.mk" CF = \$(CFLAGS) \$(CPPFLAGS) \$(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER RANLIB = ranlib ARCHIVE = \$(AR) \$(ARFLAGS) @@ -27,12 +27,12 @@ EOF } pbuild::build() { - cd "${MODULE_SRCDIR}/UMFPACK" + cd "${SRC_DIR}/UMFPACK" make TARGET=CORE2 BINARY=64 USE_THREAD=0 NO_SHARED=1 } pbuild::install() { - cd "${MODULE_SRCDIR}/UMFPACK" + cd "${SRC_DIR}/UMFPACK" install -d "${PREFIX}/include" install -d "${PREFIX}/lib" make PREFIX="${PREFIX}" install diff --git a/Compiler/atlas/build b/Compiler/atlas/build index 48318b9..96ee7be 100755 --- a/Compiler/atlas/build +++ b/Compiler/atlas/build @@ -3,7 +3,7 @@ SOURCE_URL="https://sourceforge.net/projects/math-atlas/files/Stable/$V/atlas$V.tar.bz2" pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/Compiler/boost/build b/Compiler/boost/build index 01f99e8..29c54b8 100755 --- a/Compiler/boost/build +++ b/Compiler/boost/build @@ -2,11 +2,11 @@ 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}" +BOOST_BUILD_PATH="${BUILD_DIR}" pbuild::configure() { - cd "${MODULE_SRCDIR}" - "${MODULE_SRCDIR}"/bootstrap.sh \ + cd "${SRC_DIR}" + "${SRC_DIR}"/bootstrap.sh \ --prefix="${PREFIX}" \ --with-libraries=all \ --with-python-root="${PYTHON_PREFIX}" \ @@ -14,10 +14,10 @@ pbuild::configure() { } pbuild::build() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" ./b2 \ --build-type=minimal \ - --build-dir="${MODULE_BUILDDIR}" \ + --build-dir="${BUILD_DIR}" \ --layout=system \ --without-mpi \ variant=release \ @@ -27,10 +27,10 @@ pbuild::build() { } pbuild::install() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" ./b2 \ --build-type=minimal \ - --build-dir="${MODULE_BUILDDIR}" \ + --build-dir="${BUILD_DIR}" \ --layout=system \ --without-mpi \ variant=release \ diff --git a/Compiler/clapack/build b/Compiler/clapack/build index c0f0175..380fafb 100755 --- a/Compiler/clapack/build +++ b/Compiler/clapack/build @@ -5,15 +5,15 @@ SOURCE_URL="http://www.netlib.org/$P/$P-$V-CMAKE.tgz" pbuild::configure() { cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \ - "${MODULE_SRCDIR}" \ + "${SRC_DIR}" \ || exit 1 } pbuild::install() { mkdir -p "${PREFIX}/include" mkdir -p "${PREFIX}/lib" - install -m 0644 "${MODULE_BUILDDIR}/F2CLIBS/libf2c/libf2c.a" "${PREFIX}/lib" - install -m 0644 "${MODULE_BUILDDIR}/SRC/liblapack.a" "${PREFIX}/lib" + install -m 0644 "${BUILD_DIR}/F2CLIBS/libf2c/libf2c.a" "${PREFIX}/lib" + install -m 0644 "${BUILD_DIR}/SRC/liblapack.a" "${PREFIX}/lib" } pbuild::add_to_group 'Compiler' diff --git a/Compiler/eigen3/build b/Compiler/eigen3/build index f69eef1..03e756a 100755 --- a/Compiler/eigen3/build +++ b/Compiler/eigen3/build @@ -21,7 +21,7 @@ pbuild::configure() { config_args+=( "-DSUPERLU_LIBRARIES=${SUPERLU_LIBRARY_DIR}" ) cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \ "${config_args[@]}" \ - "${MODULE_SRCDIR}" + "${SRC_DIR}" } pbuild::add_to_group 'Compiler' diff --git a/Compiler/gsl/build b/Compiler/gsl/build index fdcaa2d..8b367ed 100755 --- a/Compiler/gsl/build +++ b/Compiler/gsl/build @@ -3,7 +3,7 @@ SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz" pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/Compiler/gtest/build b/Compiler/gtest/build index 192730c..8f03d4d 100755 --- a/Compiler/gtest/build +++ b/Compiler/gtest/build @@ -22,11 +22,11 @@ pbuild::configure() { -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_BUILD_TYPE=RELEASE \ "${config_args[@]}" \ - "${MODULE_SRCDIR}" + "${SRC_DIR}" } pbuild::install() { - local -r _include_srcdir="${MODULE_SRCDIR}/include/gtest" + local -r _include_srcdir="${SRC_DIR}/include/gtest" local -r _include_dstdir="${PREFIX}/include/gtest" if [[ -e "${_include_dstdir}" ]]; then chmod -R u+w "${_include_dstdir}" diff --git a/Compiler/hdf5_serial/build b/Compiler/hdf5_serial/build index 5526142..937642c 100755 --- a/Compiler/hdf5_serial/build +++ b/Compiler/hdf5_serial/build @@ -8,7 +8,7 @@ pbuild::configure() { CXX=g++ echo "INFO: substituted pgprepro with cpp, and pgc++ with g++!" } - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --enable-shared \ --enable-cxx \ diff --git a/Compiler/mpich/build b/Compiler/mpich/build index da4105d..4a3a425 100755 --- a/Compiler/mpich/build +++ b/Compiler/mpich/build @@ -4,7 +4,7 @@ SOURCE_URL="http://www.mpich.org/static/downloads/$V/$P-$V.tar.gz" pbuild::configure() { unset F90 - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --enable-cxx \ --enable-fortran \ diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build index fc3dc31..d90aa5f 100755 --- a/Compiler/openmpi/build +++ b/Compiler/openmpi/build @@ -8,7 +8,7 @@ pbuild::configure() { config_args+=( "--with-cuda=${CUDA_HOME}" ) fi - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --enable-mpi-cxx \ --enable-mpi-cxx-seek \ diff --git a/Compiler/roger/build b/Compiler/roger/build index c3fc752..73a1381 100755 --- a/Compiler/roger/build +++ b/Compiler/roger/build @@ -5,7 +5,7 @@ pbuild::pre_configure() { } pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" } diff --git a/Compiler/root/build b/Compiler/root/build index b6b08d8..63be797 100755 --- a/Compiler/root/build +++ b/Compiler/root/build @@ -43,7 +43,7 @@ esac # xml # pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --enable-asimage \ --enable-mathmore \ --disable-ldap \ diff --git a/Compiler/vtk/build b/Compiler/vtk/build index 752ceca..ffafd2c 100755 --- a/Compiler/vtk/build +++ b/Compiler/vtk/build @@ -23,7 +23,7 @@ pbuild::configure() { -DVTK_INSTALL_INCLUDE_DIR:PATH=include \ -DVTK_INSTALL_LIB_DIR:PATH=lib \ -DVTK_USE_COCOA:BOOL=OFF \ - "${MODULE_SRCDIR}" + "${SRC_DIR}" } pbuild::add_to_group 'Compiler' From 8c5d93f59b72a493e3d7b8ab222d9f6877a1501b Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:49:25 +0200 Subject: [PATCH 36/43] refactor variable names according to changes in Pmodules/0.99.15 in build-scripts of group 'Libraries' --- Libraries/giflib/build | 2 +- Libraries/gmp/build | 2 +- Libraries/libungif/build | 2 +- Libraries/mpc/build | 2 +- Libraries/mpfr/build | 2 +- Libraries/pcre/build | 2 +- Libraries/tiff/build | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Libraries/giflib/build b/Libraries/giflib/build index 29e2c92..a5356e6 100755 --- a/Libraries/giflib/build +++ b/Libraries/giflib/build @@ -1,7 +1,7 @@ #!/usr/bin/env modbuild pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/Libraries/gmp/build b/Libraries/gmp/build index 6faae55..e68eeba 100755 --- a/Libraries/gmp/build +++ b/Libraries/gmp/build @@ -3,7 +3,7 @@ SOURCE_URL="https://gmplib.org/download/$P/$P-$V.tar.bz2" pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --disable-shared \ || exit 1 diff --git a/Libraries/libungif/build b/Libraries/libungif/build index 6ad290b..4e172ee 100755 --- a/Libraries/libungif/build +++ b/Libraries/libungif/build @@ -1,7 +1,7 @@ #!/usr/bin/env modbuild pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/Libraries/mpc/build b/Libraries/mpc/build index be22992..e5bf3bb 100755 --- a/Libraries/mpc/build +++ b/Libraries/mpc/build @@ -7,7 +7,7 @@ pbuild::add_to_group 'Libraries' pbuild::use_cc '/usr/bin/cc' pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --with-gmp=$GMP_PREFIX \ --with-mpfr=$MPFR_PREFIX \ diff --git a/Libraries/mpfr/build b/Libraries/mpfr/build index 44dcb18..c7659d3 100755 --- a/Libraries/mpfr/build +++ b/Libraries/mpfr/build @@ -3,7 +3,7 @@ SOURCE_URL="http://www.mpfr.org/$P-$V/$P-$V.tar.gz" pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --with-gmp=$GMP_PREFIX \ --disable-shared \ diff --git a/Libraries/pcre/build b/Libraries/pcre/build index 7288355..569cc94 100755 --- a/Libraries/pcre/build +++ b/Libraries/pcre/build @@ -1,7 +1,7 @@ #!/usr/bin/env modbuild pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ || exit 1 } diff --git a/Libraries/tiff/build b/Libraries/tiff/build index 737918f..6686dd9 100755 --- a/Libraries/tiff/build +++ b/Libraries/tiff/build @@ -3,7 +3,7 @@ SOURCE_URL="ftp://download.osgeo.org/libtiff/$P-$V.tar.gz" pbuild::configure() { - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --with-pic=yes \ --disable-shared \ From d1b712b976e8eb81e8de9fd7cdbcdedefdb6366f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:49:42 +0200 Subject: [PATCH 37/43] refactor variable names according to changes in Pmodules/0.99.15 in build-scripts of group 'MPI' --- MPI/BoxLib/build | 2 +- MPI/OPAL.14/build | 2 +- MPI/OPAL/build | 2 +- MPI/SuperLU_DIST/build | 6 +++--- MPI/cpmd/build | 4 ++-- MPI/dks/build | 2 +- MPI/gromacs/build | 2 +- MPI/hdf5/build | 2 +- MPI/ippl/build | 2 +- MPI/lammps/build | 6 +++--- MPI/parmetis/build | 10 +++++----- MPI/trilinos/build | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/MPI/BoxLib/build b/MPI/BoxLib/build index 55ffa86..987e709 100755 --- a/MPI/BoxLib/build +++ b/MPI/BoxLib/build @@ -4,7 +4,7 @@ pbuild::configure() { CC=$MPICC CXX=$MPICXX cmake \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_BUILD_TYPE=RELEASE \ - "${MODULE_SRCDIR}" + "${SRC_DIR}" } pbuild::add_to_group 'MPI' diff --git a/MPI/OPAL.14/build b/MPI/OPAL.14/build index 1ed1be2..695a1cf 100755 --- a/MPI/OPAL.14/build +++ b/MPI/OPAL.14/build @@ -10,7 +10,7 @@ pbuild::configure() { -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_BUILD_TYPE=RELEASE \ -DENABLE_SAAMG_SOLVER=TRUE \ - "${MODULE_SRCDIR}" + "${SRC_DIR}" } pbuild::add_to_group 'MPI' diff --git a/MPI/OPAL/build b/MPI/OPAL/build index a10f5d3..2eb5dee 100755 --- a/MPI/OPAL/build +++ b/MPI/OPAL/build @@ -22,7 +22,7 @@ pbuild::configure() { -DCMAKE_BUILD_TYPE=Release \ -DENABLE_SAAMG_SOLVER=TRUE \ "${config_args[@]}" \ - "${MODULE_SRCDIR}" + "${SRC_DIR}" } pbuild::add_to_group 'MPI' diff --git a/MPI/SuperLU_DIST/build b/MPI/SuperLU_DIST/build index e71ee8c..68335f9 100755 --- a/MPI/SuperLU_DIST/build +++ b/MPI/SuperLU_DIST/build @@ -12,7 +12,7 @@ pbuild::configure() { die 3 "Oops: unknown compiler: ${COMPILER}" ;; esac - cat < "${MODULE_SRCDIR}/make.inc" + cat < "${SRC_DIR}/make.inc" PLAT = DSuperLUroot = \${PREFIX} DSUPERLULIB = \$(DSuperLUroot)/lib/libsuperlu_dist.a @@ -37,7 +37,7 @@ EOF } pbuild::build() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" mkdir -p "${PREFIX}/lib" make } @@ -45,7 +45,7 @@ pbuild::build() { pbuild::install() { make install mkdir -p "${PREFIX}/include" - install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include" + install -m 0444 "${SRC_DIR}"/SRC/*.h "${PREFIX}/include" } diff --git a/MPI/cpmd/build b/MPI/cpmd/build index 152802a..202260e 100755 --- a/MPI/cpmd/build +++ b/MPI/cpmd/build @@ -12,7 +12,7 @@ case $OS in esac pbuild::configure() { - cp -v "${BUILD_BLOCK_DIR}/${target}" "${MODULE_BUILDDIR}/configure" + cp -v "${BUILDBLOCK_DIR}/${target}" "${BUILD_DIR}/configure" ./configure.sh "${target}" || exit 1 } @@ -22,7 +22,7 @@ pbuild::build() { pbuild::install() { mkdir -p "${PREFIX}/bin" - cp "${MODULE_SRCDIR}/bin/cpmd.x" "${PREFIX}/bin" + cp "${SRC_DIR}/bin/cpmd.x" "${PREFIX}/bin" } pbuild::add_to_group 'MPI' diff --git a/MPI/dks/build b/MPI/dks/build index fa4793d..b286846 100755 --- a/MPI/dks/build +++ b/MPI/dks/build @@ -22,7 +22,7 @@ pbuild::configure() { cmake \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ "${conf[@]}" \ - "${MODULE_SRCDIR}" \ + "${SRC_DIR}" \ || exit 1 } diff --git a/MPI/gromacs/build b/MPI/gromacs/build index 78bfb81..defc365 100755 --- a/MPI/gromacs/build +++ b/MPI/gromacs/build @@ -10,7 +10,7 @@ pbuild::configure() { -DGMX_GPU=off \ -DGMX_SIMD=SSE2 \ -DGMX_BUILD_OWN_FFTW=on \ - "${MODULE_SRCDIR}" \ + "${SRC_DIR}" \ || exit 1 } diff --git a/MPI/hdf5/build b/MPI/hdf5/build index 338bcc0..44f26bd 100755 --- a/MPI/hdf5/build +++ b/MPI/hdf5/build @@ -27,7 +27,7 @@ pbuild::configure() { #config_args+=( "--enable-threadsafe" ) config_args+=( "--with-pic" ) - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ "${config_args[@]}" \ || exit 1 diff --git a/MPI/ippl/build b/MPI/ippl/build index 2c4d9e5..c40eef8 100755 --- a/MPI/ippl/build +++ b/MPI/ippl/build @@ -12,7 +12,7 @@ pbuild::configure() { cmake \ -DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ - "${MODULE_SRCDIR}" \ + "${SRC_DIR}" \ || exit 1 } diff --git a/MPI/lammps/build b/MPI/lammps/build index 5dd6318..baef74f 100755 --- a/MPI/lammps/build +++ b/MPI/lammps/build @@ -1,14 +1,14 @@ #!/usr/bin/env modbuild pbuild::add_to_group 'MPI' -pbuild::set_download_url="file:///lammps-2017.8.tar.gz" +pbuild::set_download_url https://gitlab.psi.ch/Pmodules/download/raw/master/$P-$V.tar.gz pbuild::set_docfiles \ LICENSE \ README pbuild::compile_in_sourcetree pbuild::configure() { - cp -v "${BUILD_BLOCK_DIR}/files/Makefile.PSI" "${MODULE_BUILDDIR}/src/MAKE/MINE" + cp -v "${BUILDBLOCK_DIR}/files/Makefile.PSI" "${BUILD_DIR}/src/MAKE/MINE" } pbuild::build() { @@ -17,7 +17,7 @@ pbuild::build() { pbuild::install() { install -m 0755 -d "${PREFIX}/bin" - install -m 0755 "${MODULE_BUILDDIR}/src/lmp_PSI" "${PREFIX}/bin/lmp_omp" + install -m 0755 "${BUILD_DIR}/src/lmp_PSI" "${PREFIX}/bin/lmp_omp" strip "${PREFIX}/bin/lmp_omp" } diff --git a/MPI/parmetis/build b/MPI/parmetis/build index b8366b7..a6553f3 100755 --- a/MPI/parmetis/build +++ b/MPI/parmetis/build @@ -25,9 +25,9 @@ pbuild::configure() { if (( MAJOR_VERSION == 4 )) ; then cmake \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ - -DMETIS_PATH="${MODULE_SRCDIR}/metis" \ - -DGKLIB_PATH="${MODULE_SRCDIR}/metis/GKlib" \ - "${MODULE_SRCDIR}" \ + -DMETIS_PATH="${SRC_DIR}/metis" \ + -DGKLIB_PATH="${SRC_DIR}/metis/GKlib" \ + "${SRC_DIR}" \ || exit 1 fi } @@ -40,7 +40,7 @@ pbuild::build() { FC=$MPIFC FORTRAN=$MPIFORTRAN if (( MAJOR_VERSION == 3 )) ; then - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" make -e -j3 || exit 1 mkdir -p $PREFIX/include/metis @@ -54,7 +54,7 @@ pbuild::build() { make install LIBMETIS_A=$(find . -name libmetis.a) - METIS_H=$(find "${MODULE_SRCDIR}" -name metis.h) + METIS_H=$(find "${SRC_DIR}" -name metis.h) install -m 0644 $METIS_H $PREFIX/include install -m 0644 $LIBMETIS_A $PREFIX/lib diff --git a/MPI/trilinos/build b/MPI/trilinos/build index 355d667..47ab3be 100755 --- a/MPI/trilinos/build +++ b/MPI/trilinos/build @@ -77,7 +77,7 @@ pbuild::configure() { -DTrilinos_ENABLE_Tpetra:BOOL=ON \ -DTrilinos_ENABLE_TESTS:BOOL=OFF \ "${config_args[@]}" \ - "${MODULE_SRCDIR}" || exit 1 + "${SRC_DIR}" || exit 1 } pbuild::add_to_group 'HDF5' From aa011bcce71eefe91768cb2817c16e328aa6eae1 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:50:06 +0200 Subject: [PATCH 38/43] refactor variable names according to changes in Pmodules/0.99.15 in build-scripts of group 'MX' --- MX/phenix/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MX/phenix/build b/MX/phenix/build index bef16e9..7fb28c1 100755 --- a/MX/phenix/build +++ b/MX/phenix/build @@ -9,7 +9,7 @@ pbuild::build() { } pbuild::install() { - cd "${MODULE_SRCDIR}" + cd "${SRC_DIR}" ./install --prefix="${PREFIX%/*}" } From 7168076c507ef4d441c9a7d340344504568ee425 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:51:08 +0200 Subject: [PATCH 39/43] refactor variable names according to changes in Pmodules/0.99.15 in build-scripts of groups 'HDF5' and 'HDF5_serial' --- HDF5/H5hut/build | 2 +- HDF5/netcdf/4/variants | 1 + HDF5/netcdf/build | 2 +- HDF5_serial/H5hut/build | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 HDF5/netcdf/4/variants diff --git a/HDF5/H5hut/build b/HDF5/H5hut/build index 51bad84..e51282f 100755 --- a/HDF5/H5hut/build +++ b/HDF5/H5hut/build @@ -23,7 +23,7 @@ pbuild::configure() { ;; esac - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --enable-parallel \ --enable-debug \ diff --git a/HDF5/netcdf/4/variants b/HDF5/netcdf/4/variants new file mode 100644 index 0000000..bb2d1a8 --- /dev/null +++ b/HDF5/netcdf/4/variants @@ -0,0 +1 @@ +netcdf/4.6.1 unstable gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1 parallel-netcdf/1.9.0 diff --git a/HDF5/netcdf/build b/HDF5/netcdf/build index 52e6fc8..59d3019 100755 --- a/HDF5/netcdf/build +++ b/HDF5/netcdf/build @@ -13,7 +13,7 @@ pbuild::configure() { F90=$MPIF90 FC=$MPIFC FORTRAN=$MPIFORTRAN - "${MODULE_SRCDIR}"/configure \ + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --enable-netcdf-4 \ --with-pic \ diff --git a/HDF5_serial/H5hut/build b/HDF5_serial/H5hut/build index 21d91f0..ed62f9c 100755 --- a/HDF5_serial/H5hut/build +++ b/HDF5_serial/H5hut/build @@ -5,8 +5,8 @@ SOURCE_URL="http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.gz" # --enable-vtkconverter \ pbuild::configure() { - # (cd "${MODULE_SRCDIR}" && ./autogen.sh) - "${MODULE_SRCDIR}"/configure \ + # (cd "${SRC_DIR}" && ./autogen.sh) + "${SRC_DIR}"/configure \ --prefix="${PREFIX}" \ --enable-debug \ --with-hdf5="${HDF5_SERIAL_PREFIX}" \ From 09943de20321c9f66634585297eeefd9cbed4e9f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:55:51 +0200 Subject: [PATCH 40/43] parallel-netcdf added --- HDF5/parallel-netcdf/1/variants | 1 + HDF5/parallel-netcdf/build | 28 ++++++++++++++++++++++++++++ HDF5/parallel-netcdf/modulefile | 21 +++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 HDF5/parallel-netcdf/1/variants create mode 100755 HDF5/parallel-netcdf/build create mode 100644 HDF5/parallel-netcdf/modulefile diff --git a/HDF5/parallel-netcdf/1/variants b/HDF5/parallel-netcdf/1/variants new file mode 100644 index 0000000..deadf80 --- /dev/null +++ b/HDF5/parallel-netcdf/1/variants @@ -0,0 +1 @@ +parallel-netcdf/1.9.0 unstable gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1 diff --git a/HDF5/parallel-netcdf/build b/HDF5/parallel-netcdf/build new file mode 100755 index 0000000..d1fc426 --- /dev/null +++ b/HDF5/parallel-netcdf/build @@ -0,0 +1,28 @@ +#!/usr/bin/env modbuild + +SOURCE_URL="http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/$P-$V.tar.gz" + +pbuild::pre_configure() { + : +} + +pbuild::configure() { + "${SRC_DIR}"/configure \ + --prefix="${PREFIX}" \ + --with-mpi="${OPENMPI_DIR}" \ + --with-pic \ + --disable-shared \ + || exit 1 +} + +pbuild::add_to_group 'HDF5' +pbuild::set_docfiles \ + AUTHORS \ + COPYING \ + COPYRIGHT \ + CREDITS \ + ChangeLog \ + NEWS \ + RELEASE_NOTES +pbuild::make_all + diff --git a/HDF5/parallel-netcdf/modulefile b/HDF5/parallel-netcdf/modulefile new file mode 100644 index 0000000..8f7ea8a --- /dev/null +++ b/HDF5/parallel-netcdf/modulefile @@ -0,0 +1,21 @@ +#%Module1.0 + +module-whatis "parallel netCDF" +module-url "https://trac.mcs.anl.gov/projects/parallel-netcdf/wiki/WikiStart" +module-license "BSD-like, see \${PARALLEL_NETCDF_DIR}/share/doc/parallel-netcdf/COPYRIGHT" +module-maintainer "Achim Gsell " + +module-help " +PnetCDF is a high-performance parallel I/O library for accessing files in +format compatibility with Unidata's NetCDF, specifically the formats of +CDF-1, 2, and 5. The CDF-5 file format, an extension of CDF-2, supports +unsigned data types and uses 64-bit integers to allow users to define +large dimensions, attributes, and variables (> 2B array elements). + +In addition to the conventional netCDF read and write APIs, PnetCDF also +provides a new set of nonblocking APIs. Nonblocking APIs allow users to +post multiple read and write requests first, and later let PnetCDF to +aggregate the requests into a large MPI-IO request, hence to achieve a +better performance. See nonblocking I/O for further description and example +programs. +" From 2fafd58626c8d67b6e4df5e537ae0ac7d6a97060 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 10:56:06 +0200 Subject: [PATCH 41/43] ioapi added --- HDF5/ioapi/build | 60 ++++ HDF5/ioapi/files/Makefile.pncf.sed.patch | 271 ++++++++++++++++++ HDF5/ioapi/files/Makeinclude.OSX_x86_gfortmpi | 46 +++ HDF5/ioapi/files/variants | 1 + HDF5/ioapi/modulefile | 19 ++ 5 files changed, 397 insertions(+) create mode 100755 HDF5/ioapi/build create mode 100644 HDF5/ioapi/files/Makefile.pncf.sed.patch create mode 100644 HDF5/ioapi/files/Makeinclude.OSX_x86_gfortmpi create mode 100644 HDF5/ioapi/files/variants create mode 100644 HDF5/ioapi/modulefile diff --git a/HDF5/ioapi/build b/HDF5/ioapi/build new file mode 100755 index 0000000..6838d9e --- /dev/null +++ b/HDF5/ioapi/build @@ -0,0 +1,60 @@ +#!/usr/bin/env modbuild + +pbuild::set_download_url "https://gitlab.psi.ch/Pmodules/download/raw/master/$P-$V.tar.gz" + +pbuild::add_to_group 'HDF5' +pbuild::compile_in_sourcetree +pbuild::add_patch 'files/Makefile.pncf.sed.patch' + +pbuild::add_docfile README.txt +pbuild::add_docfile V32-CHANGES.txt +pbuild::add_docfile VERSION.txt +pbuild::add_docfile HTML/gpl.txt + +echo $SRC_DIR + +pbuild::post_prep() { + find "${SRC_DIR}" -name "*.mod" -exec rm {} \; + find "${SRC_DIR}" -name "*.o" -exec rm {} \; +} + +pbuild::pre_configure() { + config_args=() + config_args+=( "BASEDIR=${SRC_DIR}" ) + config_args+=( "CPLMODE=pncf" ) + config_args+=( "INSTALL=${PREFIX}" ) + config_args+=( "NCFLIBS=-lpnetcdf -lnetcdf -lnetcdff -lgfortran" ) + + case "${OS}" in + "Darwin" ) + config_args+=( "BIN=OSX_x86_gfortmpi" ) + ;; + * ) + echo "OS not supported!" 1>&2 + exit 1 + ;; + esac +} + +pbuild::pre_configure_Darwin() { + cd "${SRC_DIR}" + cp Makefile.template Makefile + cp -av "${BUILDBLOCK_DIR}/files/Makeinclude.OSX_x86_gfortmpi" "ioapi" +} + +pbuild::configure() { + cd "${SRC_DIR}" + make "${config_args[@]}" configure +} + +pbuild::build() { + make "${config_args[@]}" all +} + +pbuild::install() { + mkdir -p "${PREFIX}" + make "${config_args[@]}" install +} + +pbuild::make_all + diff --git a/HDF5/ioapi/files/Makefile.pncf.sed.patch b/HDF5/ioapi/files/Makefile.pncf.sed.patch new file mode 100644 index 0000000..c6b21e5 --- /dev/null +++ b/HDF5/ioapi/files/Makefile.pncf.sed.patch @@ -0,0 +1,271 @@ +Only in src/: .configure +Only in src/: .prep +Only in src/: Linux2_x86_64 +Only in src/: Makefile +Only in src/: OSX_x86_gfortmpi +Only in src/ioapi: Makefile +Only in src/ioapi: Makeinclude.OSX_x86_gfortmpi +Only in ioapi-3.2/ioapi: bilin.o +Only in ioapi-3.2/ioapi: bmatvec.o +Only in ioapi-3.2/ioapi: bufint3.o +Only in ioapi-3.2/ioapi: cbarnes1.o +Only in ioapi-3.2/ioapi: cbarnesN.o +Only in ioapi-3.2/ioapi: check3.o +Only in ioapi-3.2/ioapi: check3c.o +Only in ioapi-3.2/ioapi: chkbuf3.o +Only in ioapi-3.2/ioapi: chkfil3.o +Only in ioapi-3.2/ioapi: ckdesc3.o +Only in ioapi-3.2/ioapi: ckfile3.o +Only in ioapi-3.2/ioapi: ckgeom.o +Only in ioapi-3.2/ioapi: ckname.o +Only in ioapi-3.2/ioapi: cktflag3.o +Only in ioapi-3.2/ioapi: close3.o +Only in ioapi-3.2/ioapi: close3c.o +Only in ioapi-3.2/ioapi: crdict3.o +Only in ioapi-3.2/ioapi: crlf.o +Only in ioapi-3.2/ioapi: crtbuf3.o +Only in ioapi-3.2/ioapi: crtfil3.o +Only in ioapi-3.2/ioapi: crtkf.o +Only in ioapi-3.2/ioapi: currec.o +Only in ioapi-3.2/ioapi: currstep.o +Only in ioapi-3.2/ioapi: currstepc.o +Only in ioapi-3.2/ioapi: daymon.o +Only in ioapi-3.2/ioapi: daymonc.o +Only in ioapi-3.2/ioapi: dble2real.o +Only in ioapi-3.2/ioapi: dbllist.o +Only in ioapi-3.2/ioapi: ddtvar3.o +Only in ioapi-3.2/ioapi: ddtvar3c.o +Only in ioapi-3.2/ioapi: ddtvar3v.o +Only in ioapi-3.2/ioapi: desc3.o +Only in ioapi-3.2/ioapi: desc3c.o +Only in ioapi-3.2/ioapi: dmatvec.o +Only in ioapi-3.2/ioapi: dscgrid.o +Only in ioapi-3.2/ioapi: dscgridc.o +Only in ioapi-3.2/ioapi: dt2str.o +Only in ioapi-3.2/ioapi: dt2strc.o +Only in ioapi-3.2/ioapi: envgets.o +Only in ioapi-3.2/ioapi: filchk3.o +Only in ioapi-3.2/ioapi: filchk3c.o +Only in ioapi-3.2/ioapi: find1.o +Only in ioapi-3.2/ioapi: find2.o +Only in ioapi-3.2/ioapi: find3.o +Only in ioapi-3.2/ioapi: find4.o +Only in ioapi-3.2/ioapi: findc.o +Only in ioapi-3.2/ioapi: findr1.o +Only in ioapi-3.2/ioapi: findr2.o +Only in ioapi-3.2/ioapi: findr3.o +Only in ioapi-3.2/ioapi: findr4.o +Only in ioapi-3.2/ioapi: findsc.o +diff -ur ioapi-3.2/ioapi/fixed_src/STATE3.EXT src/ioapi/fixed_src/STATE3.EXT +--- ioapi-3.2/ioapi/fixed_src/STATE3.EXT 2017-06-20 20:00:05.000000000 +0200 ++++ src/ioapi/fixed_src/STATE3.EXT 2018-07-09 16:29:26.000000000 +0200 +@@ -11,8 +11,11 @@ + !.................................................................... + ! INCLUDE FILE STATE3.EXT + ! ++! PRIVATE! ++! For internal I/O API use only. ++! Do not use in model or other application code. + ! +-! DO NOT EDIT !! ++! DO NOT EDIT !! + ! + ! The EDSS/Models-3 I/O API depends in an essential manner + ! upon the contents of this INCLUDE file. ANY CHANGES are +Only in ioapi-3.2/ioapi: flush3.o +Only in ioapi-3.2/ioapi: gcd.o +Only in ioapi-3.2/ioapi: gctp.o +Only in ioapi-3.2/ioapi: get_endian.o +Only in ioapi-3.2/ioapi: getdate.o +Only in ioapi-3.2/ioapi: getdble.o +Only in ioapi-3.2/ioapi: getdfile.o +Only in ioapi-3.2/ioapi: getdfilec.o +Only in ioapi-3.2/ioapi: getdttime.o +Only in ioapi-3.2/ioapi: getefile.o +Only in ioapi-3.2/ioapi: getefilec.o +Only in ioapi-3.2/ioapi: getffile.o +Only in ioapi-3.2/ioapi: getmenu.o +Only in ioapi-3.2/ioapi: getnum.o +Only in ioapi-3.2/ioapi: getreal.o +Only in ioapi-3.2/ioapi: getstr.o +Only in ioapi-3.2/ioapi: getyn.o +Only in ioapi-3.2/ioapi: grdchk3.o +Only in ioapi-3.2/ioapi: gridops.o +Only in ioapi-3.2/ioapi: hhmmss.o +Only in ioapi-3.2/ioapi: hhmmssc.o +Only in ioapi-3.2/ioapi: index1.o +Only in ioapi-3.2/ioapi: init3.o +Only in ioapi-3.2/ioapi: init3c.o +Only in ioapi-3.2/ioapi: initblk3.o +Only in ioapi-3.2/ioapi: initlog3.o +Only in ioapi-3.2/ioapi: inqatt3.o +Only in ioapi-3.2/ioapi: inqatt3c.o +Only in ioapi-3.2/ioapi: interp3.o +Only in ioapi-3.2/ioapi: interp3c.o +Only in ioapi-3.2/ioapi: intg2real.o +Only in ioapi-3.2/ioapi: intlist.o +Only in ioapi-3.2/ioapi: iobin3.o +Only in ioapi-3.2/ioapi: iocpl.o +Only in ioapi-3.2/ioapi: iocplf2c.o +Only in ioapi-3.2/ioapi: ioparms3.o +Only in ioapi-3.2/ioapi: isdstime.o +Only in ioapi-3.2/ioapi: jstep3.o +Only in ioapi-3.2/ioapi: julian.o +Only in ioapi-3.2/ioapi: julianc.o +Only in ioapi-3.2/ioapi: junit.o +Only in ioapi-3.2/ioapi: kfindx.o +Only in ioapi-3.2/ioapi: kfopen.o +Only in ioapi-3.2/ioapi: kfread.o +Only in ioapi-3.2/ioapi: kfwrite.o +Only in ioapi-3.2/ioapi: lambert.o +Only in ioapi-3.2/ioapi: lblank.o +Only in ioapi-3.2/ioapi: len2.o +Only in ioapi-3.2/ioapi: ll2utm.o +Only in ioapi-3.2/ioapi: locat1.o +Only in ioapi-3.2/ioapi: locat2.o +Only in ioapi-3.2/ioapi: locat3.o +Only in ioapi-3.2/ioapi: locat4.o +Only in ioapi-3.2/ioapi: locatc.o +Only in ioapi-3.2/ioapi: locatr1.o +Only in ioapi-3.2/ioapi: locatr2.o +Only in ioapi-3.2/ioapi: locatr3.o +Only in ioapi-3.2/ioapi: locatr4.o +Only in ioapi-3.2/ioapi: locatsc.o +Only in ioapi-3.2/ioapi: lustr.o +Only in ioapi-3.2/ioapi: m3abort.o +Only in ioapi-3.2/ioapi: m3err.o +Only in ioapi-3.2/ioapi: m3errc.o +Only in ioapi-3.2/ioapi: m3exit.o +Only in ioapi-3.2/ioapi: m3exitc.o +Only in ioapi-3.2/ioapi: m3mesgc.o +Only in ioapi-3.2/ioapi: m3msg2.o +Only in ioapi-3.2/ioapi: m3utilio.mod +Only in ioapi-3.2/ioapi: m3utilio.o +Only in ioapi-3.2/ioapi: m3warn.o +Only in ioapi-3.2/ioapi: m3warnc.o +Only in ioapi-3.2/ioapi: mmddyy.o +Only in ioapi-3.2/ioapi: mmddyyc.o +Only in ioapi-3.2/ioapi: modatts3.mod +Only in ioapi-3.2/ioapi: modatts3.o +Only in ioapi-3.2/ioapi: modgctp.mod +Only in ioapi-3.2/ioapi: modgctp.o +Only in ioapi-3.2/ioapi: modmpasfio.mod +Only in ioapi-3.2/ioapi: modmpasfio.o +Only in ioapi-3.2/ioapi: modncfio.mod +Only in ioapi-3.2/ioapi: modncfio.o +Only in ioapi-3.2/ioapi: modpdata.mod +Only in ioapi-3.2/ioapi: modpdata.o +Only in ioapi-3.2/ioapi: modwrfio.mod +Only in ioapi-3.2/ioapi: modwrfio.o +Only in ioapi-3.2/ioapi: name2fid.o +Only in ioapi-3.2/ioapi: nameval.o +Only in ioapi-3.2/ioapi: nextime.o +Only in ioapi-3.2/ioapi: nextimec.o +Only in ioapi-3.2/ioapi: open3.o +Only in ioapi-3.2/ioapi: open3c.o +Only in ioapi-3.2/ioapi: opnfil3.o +Only in ioapi-3.2/ioapi: opnkf.o +Only in ioapi-3.2/ioapi: opnlist3.o +Only in ioapi-3.2/ioapi: opnlog3.o +Only in ioapi-3.2/ioapi: pcoef.o +Only in ioapi-3.2/ioapi: pgrdsum.o +Only in ioapi-3.2/ioapi: pmatvec.o +Only in ioapi-3.2/ioapi: pn_crtfil3.o +Only in ioapi-3.2/ioapi: pn_opnfil3.o +Only in ioapi-3.2/ioapi: pn_wrvars.o +Only in ioapi-3.2/ioapi: poly.o +Only in ioapi-3.2/ioapi: promptdfile.o +Only in ioapi-3.2/ioapi: promptffile.o +Only in ioapi-3.2/ioapi: promptgrid.o +Only in ioapi-3.2/ioapi: promptmfile.o +Only in ioapi-3.2/ioapi: rdatt3.o +Only in ioapi-3.2/ioapi: rdatt3c.o +Only in ioapi-3.2/ioapi: rdbndary.o +Only in ioapi-3.2/ioapi: rdbuf3.o +Only in ioapi-3.2/ioapi: rdcustom.o +Only in ioapi-3.2/ioapi: rddict3.o +Only in ioapi-3.2/ioapi: rdgrdded.o +Only in ioapi-3.2/ioapi: rdgrnest.o +Only in ioapi-3.2/ioapi: rdiddata.o +Only in ioapi-3.2/ioapi: rdprofil.o +Only in ioapi-3.2/ioapi: rdsmatrx.o +Only in ioapi-3.2/ioapi: rdtflag.o +Only in ioapi-3.2/ioapi: rdvars.o +Only in ioapi-3.2/ioapi: read3.o +Only in ioapi-3.2/ioapi: read3c.o +Only in ioapi-3.2/ioapi: read4d.o +Only in ioapi-3.2/ioapi: read4dc.o +Only in ioapi-3.2/ioapi: readsmet.o +Only in ioapi-3.2/ioapi: realist.o +Only in ioapi-3.2/ioapi: rmfile.o +Only in ioapi-3.2/ioapi: runspec.o +Only in ioapi-3.2/ioapi: scanint.o +Only in ioapi-3.2/ioapi: sec2time.o +Only in ioapi-3.2/ioapi: sec2timec.o +Only in ioapi-3.2/ioapi: secsdiff.o +Only in ioapi-3.2/ioapi: secsdiffc.o +Only in ioapi-3.2/ioapi: setsphere.o +Only in ioapi-3.2/ioapi: shut3.o +Only in ioapi-3.2/ioapi: shut3c.o +Only in ioapi-3.2/ioapi: skipl.o +Only in ioapi-3.2/ioapi: sleep3.o +Only in ioapi-3.2/ioapi: smatvec.o +Only in ioapi-3.2/ioapi: sortic.o +Only in ioapi-3.2/ioapi: sortir.o +Only in ioapi-3.2/ioapi: sortis.o +Only in ioapi-3.2/ioapi: splitline.o +Only in ioapi-3.2/ioapi: str2dble.o +Only in ioapi-3.2/ioapi: str2int.o +Only in ioapi-3.2/ioapi: str2real.o +Only in ioapi-3.2/ioapi: strlist.o +Only in ioapi-3.2/ioapi: sync3.o +Only in ioapi-3.2/ioapi: sync3c.o +Only in ioapi-3.2/ioapi: syncfid.o +Only in ioapi-3.2/ioapi: synchtao.o +Only in ioapi-3.2/ioapi: systemf.o +Only in ioapi-3.2/ioapi: time2sec.o +Only in ioapi-3.2/ioapi: time2secc.o +Only in ioapi-3.2/ioapi: trimlen.o +Only in ioapi-3.2/ioapi: ungridb.o +Only in ioapi-3.2/ioapi: ungridi.o +Only in ioapi-3.2/ioapi: upcase.o +Only in ioapi-3.2/ioapi: utm2ll.o +Only in ioapi-3.2/ioapi: wkday.o +Only in ioapi-3.2/ioapi: wkdayc.o +Only in ioapi-3.2/ioapi: wratt3.o +Only in ioapi-3.2/ioapi: wratt3c.o +Only in ioapi-3.2/ioapi: wrbndary.o +Only in ioapi-3.2/ioapi: wrbuf3.o +Only in ioapi-3.2/ioapi: wrcustom.o +Only in ioapi-3.2/ioapi: wrdict3.o +Only in ioapi-3.2/ioapi: wrgrdded.o +Only in ioapi-3.2/ioapi: wrgrnest.o +Only in ioapi-3.2/ioapi: wriddata.o +Only in ioapi-3.2/ioapi: write3.o +Only in ioapi-3.2/ioapi: write3c.o +Only in ioapi-3.2/ioapi: write4d.o +Only in ioapi-3.2/ioapi: write4dc.o +Only in ioapi-3.2/ioapi: wrmpigrd.o +Only in ioapi-3.2/ioapi: wrpatch.o +Only in ioapi-3.2/ioapi: wrprofil.o +Only in ioapi-3.2/ioapi: wrsmatrx.o +Only in ioapi-3.2/ioapi: wrtflag.o +Only in ioapi-3.2/ioapi: wrvars.o +Only in ioapi-3.2/ioapi: xtbuf3.o +Only in ioapi-3.2/ioapi: xtract3.o +Only in ioapi-3.2/ioapi: xtract3c.o +Only in ioapi-3.2/ioapi: year4.o +Only in ioapi-3.2/ioapi: yr2day.o +Only in src/m3tools: Makefile +diff -ur ioapi-3.2/m3tools/Makefile.pncf.sed src/m3tools/Makefile.pncf.sed +--- ioapi-3.2/m3tools/Makefile.pncf.sed 2017-10-21 03:37:21.000000000 +0200 ++++ src/m3tools/Makefile.pncf.sed 2018-07-09 18:01:58.000000000 +0200 +@@ -99,7 +99,7 @@ + insertgrid jul2greg juldate juldiff julshift \ + kfxtract latlon m3agmax m3agmask m3cple \ + m3combo m3diff m3edhdr m3fake m3hdr \ +-m3interp m3mask m3merge m3pair m3probe \ ++m3interp m3merge m3pair m3probe \ + m3stat m3totxt m3tproc m3tshift m3wndw \ + m3xtract mtxblend mtxbuild mtxcalc mtxcple \ + presterp presz projtool selmrg2d timeshift \ diff --git a/HDF5/ioapi/files/Makeinclude.OSX_x86_gfortmpi b/HDF5/ioapi/files/Makeinclude.OSX_x86_gfortmpi new file mode 100644 index 0000000..c2dbaaa --- /dev/null +++ b/HDF5/ioapi/files/Makeinclude.OSX_x86_gfortmpi @@ -0,0 +1,46 @@ +# Version "$Id: Makeinclude.Linux2_x86_64gfortmpi 1 2017-06-10 18:05:20Z coats $" +# +# Build MPI/PnetCDF distributed-file support using "mpif90" and "mpcc", +# where compilers are built "on top of" Gnu compilers +# +# 12/2013 by CJC: Conditional preprocessor-code "-DNEED_ARGS=1" +# to implement IARGC() and GETARG() for compilers +# ("gfortran" version 4.8 or later to be exact) that insist on +# enforcing F2003-only with no backwards nor industry-standards compatibility. +# +# Remove "-DNEED_ARGS=1" from ARCHFLAGS for version 4.7.x and earlier +# +# Use "-march=native -mtune=native" if compile-platform and compute-platform +# are the same. +# Use "-Wall -Wsurprising" for full diagnostics. + +AR = ar +CC = mpicc +CXX = mpiCC +FC = mpif90 +M4 = m4 +LINK = $(CC) + +## Module-include-directory command +MODI = -I +E132 = -ffixed-line-length-132 + +MFLAGS = -ffast-math -funroll-loops -m64 # -Wall -Wsurprising -march=native -mtune=native + +OMPFLAGS = -fopenmp +OMPLIBS = -fopenmp +COPTFLAGS = -O3 ${MFLAGS} +FOPTFLAGS = -O3 ${MFLAGS} +FPPFLAGS = -DF90=1 -DIOAPI_PNCF=1 +FSFLAGS = -fno-automatic +ARCHFLAGS = \ + -DAUTO_ARRAYS=1 \ + -DF90=1 -DFLDMN=1 \ + -DFSTR_L=int \ + -DIOAPI_NO_STDOUT=1 \ + -DNEED_ARGS=1 +PARFLAGS = +ARCHLIB = -dynamic -lm -lpthread -lc + +M4DEFFILE = $(PVM_ROOT)/conf/$(PVM_ARCH).m4 +PVMLIBS = -lpvm3 diff --git a/HDF5/ioapi/files/variants b/HDF5/ioapi/files/variants new file mode 100644 index 0000000..09884c3 --- /dev/null +++ b/HDF5/ioapi/files/variants @@ -0,0 +1 @@ +ioapi/3.2 unstable gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1 netcdf/4.6.1 parallel-netcdf/1.9.0 diff --git a/HDF5/ioapi/modulefile b/HDF5/ioapi/modulefile new file mode 100644 index 0000000..be7b1dd --- /dev/null +++ b/HDF5/ioapi/modulefile @@ -0,0 +1,19 @@ +#%Module1.0 + +module-whatis "Models-3 Input/Output Applications Programming Interface" +module-url "https://www.cmascenter.org/ioapi/" +module-license "GNU GPLv2" +module-maintainer "Achim Gsell " + +module-help " +The Models-3 Input/Output Applications Programming Interface (I/O API) is +a selective and direct-access programming interface to the data: you tell +the system what variables and dates and times you're talking about and it +figures all the stuff about record numbers, etc., for itself. Also, you +don't have to read the data in consecutive order, or to write it in order, +either -- you just ask for what you want, and the I/O API finds it for you +(although there are moderate performance penalties for writing data out-of- +order). The files are self-describing files -- that is, the file headers +have all the dimensioning and descriptive information needed about the data +in them. +" From b2a283ba1c04e235967d2da37b156771c01ee797 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 17:36:33 +0200 Subject: [PATCH 42/43] ioapi/build: reviewed --- HDF5/ioapi/build | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/HDF5/ioapi/build b/HDF5/ioapi/build index 6838d9e..fc38ccc 100755 --- a/HDF5/ioapi/build +++ b/HDF5/ioapi/build @@ -1,5 +1,7 @@ #!/usr/bin/env modbuild +pbuild::supported_os 'Darwin' + pbuild::set_download_url "https://gitlab.psi.ch/Pmodules/download/raw/master/$P-$V.tar.gz" pbuild::add_to_group 'HDF5' @@ -11,43 +13,33 @@ pbuild::add_docfile V32-CHANGES.txt pbuild::add_docfile VERSION.txt pbuild::add_docfile HTML/gpl.txt -echo $SRC_DIR +declare config_args=() +declare BIN='' pbuild::post_prep() { find "${SRC_DIR}" -name "*.mod" -exec rm {} \; find "${SRC_DIR}" -name "*.o" -exec rm {} \; } +pbuild::pre_configure_Darwin() { + cp -av "${BUILDBLOCK_DIR}/files/Makeinclude.OSX_x86_gfortmpi" "ioapi" + BIN='OSX_x86_gfortmpi' +} + pbuild::pre_configure() { - config_args=() + cp Makefile.template Makefile config_args+=( "BASEDIR=${SRC_DIR}" ) config_args+=( "CPLMODE=pncf" ) config_args+=( "INSTALL=${PREFIX}" ) config_args+=( "NCFLIBS=-lpnetcdf -lnetcdf -lnetcdff -lgfortran" ) - - case "${OS}" in - "Darwin" ) - config_args+=( "BIN=OSX_x86_gfortmpi" ) - ;; - * ) - echo "OS not supported!" 1>&2 - exit 1 - ;; - esac -} - -pbuild::pre_configure_Darwin() { - cd "${SRC_DIR}" - cp Makefile.template Makefile - cp -av "${BUILDBLOCK_DIR}/files/Makeinclude.OSX_x86_gfortmpi" "ioapi" + config_args+=( "BIN=${BIN}" ) } pbuild::configure() { - cd "${SRC_DIR}" make "${config_args[@]}" configure } -pbuild::build() { +pbuild::compile() { make "${config_args[@]}" all } @@ -56,5 +48,13 @@ pbuild::install() { make "${config_args[@]}" install } +pbuild::post_install() { + cd "${PREFIX}" + mkdir -p lib + mv -v "${BIN}"/*.a 'lib' + mv -v "${BIN}"/*.mod 'lib' + mv -v "${BIN}" 'bin' +} + pbuild::make_all From c5e0f8bb795109124f6546cddf8829ca9f403658 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 11 Jul 2018 17:37:51 +0200 Subject: [PATCH 43/43] 'pbuild::build' has been renamed to 'pbuild::compile' in version 0.99.15 --- Compiler/OpenBLAS/build | 2 +- Compiler/OpenBLAS_OMP/build | 2 +- Compiler/SuperLU/build | 2 +- Compiler/UMFPACK/build | 2 +- Compiler/boost/build | 2 +- Compiler/root/build | 2 +- HDF5/H5hut/build | 2 +- HDF5/netcdf/build | 2 +- HDF5_serial/H5hut/build | 2 +- MPI/SuperLU_DIST/build | 2 +- MPI/cpmd/build | 2 +- MPI/lammps/build | 2 +- MPI/parmetis/build | 2 +- MX/phenix/build | 2 +- Programming/cuda/build | 2 +- Programming/ld64/build | 2 +- Programming/psi-python27/build | 2 +- System/fsstress/build | 2 +- System/mdtest/build | 2 +- System/nmap/build | 2 +- System/unison/build | 2 +- Tools/git/build | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Compiler/OpenBLAS/build b/Compiler/OpenBLAS/build index 152b226..d0c90ff 100755 --- a/Compiler/OpenBLAS/build +++ b/Compiler/OpenBLAS/build @@ -30,7 +30,7 @@ EOF sed -i.bak "s/MACOSX_DEPLOYMENT_TARGET=.*/MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET/" "${SRC_DIR}/Makefile.system" } -pbuild::build() { +pbuild::compile() { make -j3 } diff --git a/Compiler/OpenBLAS_OMP/build b/Compiler/OpenBLAS_OMP/build index 93a596d..2c8da5e 100755 --- a/Compiler/OpenBLAS_OMP/build +++ b/Compiler/OpenBLAS_OMP/build @@ -23,7 +23,7 @@ COMMON_PROF = -pg EOF } -pbuild::build() { +pbuild::compile() { cd "${SRC_DIR}" make } diff --git a/Compiler/SuperLU/build b/Compiler/SuperLU/build index db460da..d290fed 100755 --- a/Compiler/SuperLU/build +++ b/Compiler/SuperLU/build @@ -37,7 +37,7 @@ pbuild::configure() { } fi -pbuild::build() { +pbuild::compile() { if (( V_MAJOR < 5 )); then cd "${SRC_DIR}" mkdir -p "${PREFIX}/lib" diff --git a/Compiler/UMFPACK/build b/Compiler/UMFPACK/build index 17ce52b..bb5848d 100755 --- a/Compiler/UMFPACK/build +++ b/Compiler/UMFPACK/build @@ -26,7 +26,7 @@ TBB = EOF } -pbuild::build() { +pbuild::compile() { cd "${SRC_DIR}/UMFPACK" make TARGET=CORE2 BINARY=64 USE_THREAD=0 NO_SHARED=1 } diff --git a/Compiler/boost/build b/Compiler/boost/build index 29c54b8..dc73fd0 100755 --- a/Compiler/boost/build +++ b/Compiler/boost/build @@ -13,7 +13,7 @@ pbuild::configure() { || exit 1 } -pbuild::build() { +pbuild::compile() { cd "${SRC_DIR}" ./b2 \ --build-type=minimal \ diff --git a/Compiler/root/build b/Compiler/root/build index 63be797..be2e917 100755 --- a/Compiler/root/build +++ b/Compiler/root/build @@ -58,7 +58,7 @@ pbuild::configure() { || exit 1 } -pbuild::build() { +pbuild::compile() { make -j 4 } diff --git a/HDF5/H5hut/build b/HDF5/H5hut/build index e51282f..509fff1 100755 --- a/HDF5/H5hut/build +++ b/HDF5/H5hut/build @@ -34,7 +34,7 @@ pbuild::configure() { || exit 1 } -pbuild::build() { +pbuild::compile() { make -C src make -C tools } diff --git a/HDF5/netcdf/build b/HDF5/netcdf/build index 59d3019..40e0960 100755 --- a/HDF5/netcdf/build +++ b/HDF5/netcdf/build @@ -22,7 +22,7 @@ pbuild::configure() { || exit 1 } -pbuild::build() { +pbuild::compile() { make check make make install diff --git a/HDF5_serial/H5hut/build b/HDF5_serial/H5hut/build index ed62f9c..2c30a5b 100755 --- a/HDF5_serial/H5hut/build +++ b/HDF5_serial/H5hut/build @@ -14,7 +14,7 @@ pbuild::configure() { || exit 1 } -pbuild::build() { +pbuild::compile() { make -C src make -C tools } diff --git a/MPI/SuperLU_DIST/build b/MPI/SuperLU_DIST/build index 68335f9..2643c6a 100755 --- a/MPI/SuperLU_DIST/build +++ b/MPI/SuperLU_DIST/build @@ -36,7 +36,7 @@ CDEFS = -DAdd__ EOF } -pbuild::build() { +pbuild::compile() { cd "${SRC_DIR}" mkdir -p "${PREFIX}/lib" make diff --git a/MPI/cpmd/build b/MPI/cpmd/build index 202260e..2d6e809 100755 --- a/MPI/cpmd/build +++ b/MPI/cpmd/build @@ -16,7 +16,7 @@ pbuild::configure() { ./configure.sh "${target}" || exit 1 } -pbuild::build() { +pbuild::compile() { make } diff --git a/MPI/lammps/build b/MPI/lammps/build index baef74f..d6904b5 100755 --- a/MPI/lammps/build +++ b/MPI/lammps/build @@ -11,7 +11,7 @@ pbuild::configure() { cp -v "${BUILDBLOCK_DIR}/files/Makefile.PSI" "${BUILD_DIR}/src/MAKE/MINE" } -pbuild::build() { +pbuild::compile() { make -C src PSI } diff --git a/MPI/parmetis/build b/MPI/parmetis/build index a6553f3..31c5ed2 100755 --- a/MPI/parmetis/build +++ b/MPI/parmetis/build @@ -32,7 +32,7 @@ pbuild::configure() { fi } -pbuild::build() { +pbuild::compile() { CC=$MPICC CXX=$MPICXX F77=$MPIF77 diff --git a/MX/phenix/build b/MX/phenix/build index 7fb28c1..0b3562a 100755 --- a/MX/phenix/build +++ b/MX/phenix/build @@ -4,7 +4,7 @@ pbuild::configure() { : } -pbuild::build() { +pbuild::compile() { : } diff --git a/Programming/cuda/build b/Programming/cuda/build index acd129f..2b12964 100755 --- a/Programming/cuda/build +++ b/Programming/cuda/build @@ -10,7 +10,7 @@ pbuild::configure() { : } -pbuild::build() { +pbuild::compile() { : } diff --git a/Programming/ld64/build b/Programming/ld64/build index 593fb4b..345d3f3 100755 --- a/Programming/ld64/build +++ b/Programming/ld64/build @@ -57,7 +57,7 @@ pbuild::configure() { cp -v "${BUILDBLOCK_DIR}/files/Makefile-${V_MAJOR}" "${SRC_DIR}/Makefile" } -pbuild::build() { +pbuild::compile() { cd "${SRC_DIR}" which $CC make OTHER_CXXFLAGS="-std=c++11 -I$PWD/include" OTHER_LDFLAGS="-L/Applications/Xcode.app/Contents/Frameworks -lLTO" diff --git a/Programming/psi-python27/build b/Programming/psi-python27/build index 47c4b6d..8d9d6c8 100755 --- a/Programming/psi-python27/build +++ b/Programming/psi-python27/build @@ -4,7 +4,7 @@ pbuild::configure() { : } -pbuild::build() { +pbuild::compile() { : } diff --git a/System/fsstress/build b/System/fsstress/build index 8373e14..ed680a1 100755 --- a/System/fsstress/build +++ b/System/fsstress/build @@ -4,7 +4,7 @@ pbuild::configure() { : } -pbuild::build() { +pbuild::compile() { cd "${SRC_DIR}" make -j ${JOBS} diff --git a/System/mdtest/build b/System/mdtest/build index afd039e..116dedd 100755 --- a/System/mdtest/build +++ b/System/mdtest/build @@ -4,7 +4,7 @@ pbuild::configure() { : } -pbuild::build() { +pbuild::compile() { cd "${SRC_DIR}" make -j ${JOBS} diff --git a/System/nmap/build b/System/nmap/build index 68f991c..4ba9896 100755 --- a/System/nmap/build +++ b/System/nmap/build @@ -11,7 +11,7 @@ pbuild::configure() { --with-liblinear=included } -pbuild::build() { +pbuild::compile() { cd "${SRC_DIR}" make -j "${JOBS}" } diff --git a/System/unison/build b/System/unison/build index 03f6634..f8d2555 100755 --- a/System/unison/build +++ b/System/unison/build @@ -4,7 +4,7 @@ pbuild::configure() { : } -pbuild::build() { +pbuild::compile() { cd "${SRC_DIR}" make } diff --git a/Tools/git/build b/Tools/git/build index 716bad3..7312072 100755 --- a/Tools/git/build +++ b/Tools/git/build @@ -19,7 +19,7 @@ pbuild::configure() { || exit 1 } -pbuild::build() { +pbuild::compile() { cd "${SRC_DIR}" make