build-scripts for UMFPACK and eigen reviewed, variants with gcc/7.3.0 added

This commit is contained in:
2018-10-12 21:03:01 +02:00
parent 25d26c0fbd
commit acf1cad58b
5 changed files with 15 additions and 19 deletions

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env modbuild
pbuild::set_download_url "file://$PMODULES_DISTFILESDIR/$P-V.tar.bz2"
pbuild::set_download_url "https://gitlab.psi.ch/Pmodules/download/raw/master/$P-$V.tar.bz2"
pbuild::add_to_group 'Compiler'
pbuild::compile_in_sourcetree

View File

@@ -4,3 +4,4 @@ UMFPACK/5.6.2 stable gcc/4.8.4 OpenBLAS/0.2.9
UMFPACK/5.6.2 stable gcc/4.9.2 OpenBLAS/0.2.9
UMFPACK/5.6.2 unstable gcc/4.9.3 OpenBLAS/0.2.9
UMFPACK/5.6.2 unstable gcc/5.4.0 OpenBLAS/0.2.19
UMFPACK/5.6.2 unstable gcc/7.3.0 OpenBLAS/0.2.20

View File

@@ -1 +0,0 @@
eigen/3.3.4 unstable gcc/5.4.0 b:cmake/3.6.3 b:mpfr/3.1.5 b:gmp/6.1.2 b:UMFPACK/5.6.2 b:boost/1.62.0 b:SuperLU/5.2.1

View File

@@ -1,25 +1,19 @@
#!/usr/bin/env modbuild
#
pbuild::add_to_group 'Compiler'
pbuild::set_download_url "http://bitbucket.org/eigen/eigen/get/${V_PKG}.tar.bz2"
pbuild::set_download_url "http://bitbucket.org/eigen/eigen/get/${V_MAJOR}.${V_MINOR}.${V_PATCHLVL}.tar.bz2"
pbuild::configure() {
pbuild::pre_configure() {
export BOOST_ROOT="${BOOST_PREFIX}"
config_args=()
config_args+=( "-DUMFPACK_INCLUDES=${UMFPACK_INCLUDE_DIR}" )
config_args+=( "-DUMFPACK_LIBRARIES=${UMFPACK_LIBRARY_DIR}" )
config_args+=( "-DGMP_INCLUDES=${GMP_INCLUDE_DIR}" )
config_args+=( "-DGMP_LIBRARIES=${GMP_LIBRARY_DIR}" )
config_args+=( "-DMPFR_INCLUDES=${MPFR_INCLUDE_DIR}" )
config_args+=( "-DMPFR_LIBRARIES=${MPFR_LIBRARY_DIR}" )
config_args+=( "-DSUPERLU_INCLUDES=${SUPERLU_INCLUDE_DIR}" )
config_args+=( "-DSUPERLU_LIBRARIES=${SUPERLU_LIBRARY_DIR}" )
cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
"${config_args[@]}" \
"${SRC_DIR}"
pbuild::add_configure_args "-DUMFPACK_INCLUDES=${UMFPACK_INCLUDE_DIR}"
pbuild::add_configure_args "-DUMFPACK_LIBRARIES=${UMFPACK_LIBRARY_DIR}"
pbuild::add_configure_args "-DGMP_INCLUDES=${GMP_INCLUDE_DIR}"
pbuild::add_configure_args "-DGMP_LIBRARIES=${GMP_LIBRARY_DIR}"
pbuild::add_configure_args "-DMPFR_INCLUDES=${MPFR_INCLUDE_DIR}"
pbuild::add_configure_args "-DMPFR_LIBRARIES=${MPFR_LIBRARY_DIR}"
pbuild::add_configure_args "-DSUPERLU_INCLUDES=${SUPERLU_INCLUDE_DIR}"
pbuild::add_configure_args "-DSUPERLU_LIBRARIES=${SUPERLU_LIBRARY_DIR}"
}
pbuild::add_to_group 'Compiler'
pbuild::make_all

View File

@@ -0,0 +1,2 @@
eigen3/3.3.4 unstable gcc/5.4.0 b:cmake/3.6.3 b:mpfr/3.1.5 b:gmp/6.1.2 b:UMFPACK/5.6.2 b:boost/1.62.0 b:SuperLU/5.2.1
eigen3/3.3.5 unstable gcc/7.3.0 b:cmake/3.9.6 b:mpfr/4.0.1 b:gmp/6.1.2 b:UMFPACK/5.6.2 b:boost/1.68.0 b:SuperLU/5.2.1