From ec670689eecd68b09f7a7405187e65b65c1dd270 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Mon, 2 Nov 2015 18:45:19 +0100 Subject: [PATCH] candi/deal: every package is installed in its own dir (untested) --- candi.sh | 4 +--- deal.II-toolchain/packages/boost.package | 10 ++++++---- deal.II-toolchain/packages/bzip2.package | 11 ++++++----- deal.II-toolchain/packages/cmake.package | 4 ++-- deal.II-toolchain/packages/dealii-prepare.package | 6 ------ deal.II-toolchain/packages/dealii-stable.package | 2 ++ deal.II-toolchain/packages/dealii.package | 3 +-- deal.II-toolchain/packages/hwloc.package | 7 ------- deal.II-toolchain/packages/opencascade.package | 6 ++++-- deal.II-toolchain/packages/p4est.package | 10 ++++++---- deal.II-toolchain/packages/parmetis.package | 4 +++- deal.II-toolchain/packages/petsc.package | 5 +++-- deal.II-toolchain/packages/slepc.package | 8 ++++---- deal.II-toolchain/packages/superlu_dist.package | 3 ++- deal.II-toolchain/packages/trilinos.package | 6 ++---- deal.II-toolchain/packages/zlib.package | 4 +++- 16 files changed, 45 insertions(+), 48 deletions(-) delete mode 100644 deal.II-toolchain/packages/hwloc.package diff --git a/candi.sh b/candi.sh index 00fb119..3cdf603 100755 --- a/candi.sh +++ b/candi.sh @@ -765,7 +765,6 @@ mkdir -p ${DOWNLOAD_PATH} mkdir -p ${UNPACK_PATH} mkdir -p ${BUILD_PATH} mkdir -p ${INSTALL_PATH} -mkdir -p ${INSTALL_PATH}/lib ORIG_INSTALL_PATH=${INSTALL_PATH} ORIG_PROCS=${PROCS} @@ -828,7 +827,7 @@ for PACKAGE in ${PACKAGES[@]}; do package_specific_install () { true; } package_specific_register () { true; } package_specific_conf() { true; } - + # Fetch information pertinent to the package source ${PROJECT}/packages/${PACKAGE}.package @@ -893,4 +892,3 @@ cecho ${GOOD} "Build finished in $((TOC_GLOBAL/1000000000)) seconds." echo echo "Summary of timings:" echo -e "$TIMINGS" - diff --git a/deal.II-toolchain/packages/boost.package b/deal.II-toolchain/packages/boost.package index 0c34641..2557879 100644 --- a/deal.II-toolchain/packages/boost.package +++ b/deal.II-toolchain/packages/boost.package @@ -4,16 +4,18 @@ PACKING=.tar.gz CHECKSUM=51528a0e3b33d9e10aaa311d9eb451e3 BUILDCHAIN=custom +INSTALL_PATH=${INSTALL_PATH}/${NAME} + package_specific_build () { cp -rf ${UNPACK_PATH}/${NAME}/* . - ./bootstrap.sh --prefix=${INSTALL_PATH}/${NAME} + ./bootstrap.sh --prefix=${INSTALL_PATH} echo "using mpi ;" > user-config.jam ./b2 -j ${PROCS} --user-config=user-config.jam --build-dir=candi_build_dir link=shared install ${CONFOPTS} } package_specific_register () { - export BOOST_ROOT=${INSTALL_PATH}/${NAME} - export BOOST_INCLUDEDIR=${INSTALL_PATH}/${NAME}/include - export BOOST_LIBRARYDIR=${INSTALL_PATH}/${NAME}/lib + export BOOST_ROOT=${INSTALL_PATH} + export BOOST_INCLUDEDIR=${INSTALL_PATH}/include + export BOOST_LIBRARYDIR=${INSTALL_PATH}/lib export BOOST_USE_MULTITHREADED=OFF } diff --git a/deal.II-toolchain/packages/bzip2.package b/deal.II-toolchain/packages/bzip2.package index 3d2c5fc..ef4d77e 100644 --- a/deal.II-toolchain/packages/bzip2.package +++ b/deal.II-toolchain/packages/bzip2.package @@ -1,14 +1,15 @@ NAME=bzip2-1.0.6 SOURCE=http://www.bzip.org/1.0.6/ PACKING=.tar.gz -DOWNLOADER=curl CHECKSUM=00b516f4704d4a7cb50a1d97e6e8e15b BUILDCHAIN=custom +INSTALL_PATH=${INSTALL_PATH}/${NAME} + package_specific_build () { cp -rf ${UNPACK_PATH}/${NAME}/* . - - # patch the Makefile + + # patch the Makefile patch -p1 --forward < ${ORIG_DIR}/${PROJECT}/patches/bzip2-1.0.6.patch || true # compile bzip2 @@ -16,6 +17,6 @@ package_specific_build () { } package_specific_register () { - export BZIP2_INCLUDE=${INSTALL_PATH}/${NAME}/include - export BZIP2_LIBPATH=${INSTALL_PATH}/${NAME}/lib + export BZIP2_INCLUDE=${INSTALL_PATH}/include + export BZIP2_LIBPATH=${INSTALL_PATH}/lib } diff --git a/deal.II-toolchain/packages/cmake.package b/deal.II-toolchain/packages/cmake.package index d0eeb56..a19f64c 100644 --- a/deal.II-toolchain/packages/cmake.package +++ b/deal.II-toolchain/packages/cmake.package @@ -2,9 +2,10 @@ VERSION=3.4.0-rc2-Linux-x86_64 NAME=cmake-${VERSION} SOURCE=https://cmake.org/files/v3.4/ PACKING=.tar.gz +CHECKSUM=511db6fe363aa323905e1c06f7b22425 BUILDCHAIN=custom -CHECKSUM=511db6fe363aa323905e1c06f7b22425 +INSTALL_PATH=${INSTALL_PATH}/${NAME} package_specific_build () { cp -rf ${UNPACK_PATH}/${NAME}/* ${INSTALL_PATH}/ @@ -14,4 +15,3 @@ package_specific_build () { package_specific_register () { export PATH=${INSTALL_PATH}/bin:${PATH} } - diff --git a/deal.II-toolchain/packages/dealii-prepare.package b/deal.II-toolchain/packages/dealii-prepare.package index 10a5fd0..75cc33f 100644 --- a/deal.II-toolchain/packages/dealii-prepare.package +++ b/deal.II-toolchain/packages/dealii-prepare.package @@ -1,11 +1,6 @@ NAME=dealii-prepare BUILDCHAIN=ignore -######################################################################### -# Install third-party libraries in opt -INSTALL_PATH=${INSTALL_PATH}/opt - - ######################################################################### # Loop over the options in DEAL_CONFOPTS and if the package is turned off, add # it to the PACKAGES_OFF list. @@ -37,4 +32,3 @@ fi PACKAGES_OFF=${PACKAGES_OFF,,} PACKAGE=dealii-prepare - diff --git a/deal.II-toolchain/packages/dealii-stable.package b/deal.II-toolchain/packages/dealii-stable.package index 6e3f04a..d0cc724 100644 --- a/deal.II-toolchain/packages/dealii-stable.package +++ b/deal.II-toolchain/packages/dealii-stable.package @@ -4,3 +4,5 @@ EXTRACTSTO=deal.II-${VERSION} SOURCE=https://github.com/dealii/ PACKING=git BUILDCHAIN=cmake + +INSTALL_PATH=${INSTALL_PATH}/deal.II-${VERSION} diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package index 81d72d8..72af3af 100644 --- a/deal.II-toolchain/packages/dealii.package +++ b/deal.II-toolchain/packages/dealii.package @@ -5,7 +5,7 @@ SOURCE=https://github.com/dealii/ PACKING=git BUILDCHAIN=cmake -INSTALL_PATH=${INSTALL_PATH}/.. +INSTALL_PATH=${INSTALL_PATH}/deal.II-${VERSION} CONFOPTS=" \ ${DEAL_CONFOPTS} \ @@ -90,4 +90,3 @@ setenv DEAL_II_DIR ${INSTALL_PATH} export DEAL_II_DIR=${INSTALL_PATH} } - diff --git a/deal.II-toolchain/packages/hwloc.package b/deal.II-toolchain/packages/hwloc.package deleted file mode 100644 index e0bbdc0..0000000 --- a/deal.II-toolchain/packages/hwloc.package +++ /dev/null @@ -1,7 +0,0 @@ -VERSION=1.9 -NAME=hwloc-${VERSION} -SOURCE=http://www.open-mpi.org/software/hwloc/v${VERSION}/downloads/ -PACKING=.tar.gz -CHECKSUM=1f9f9155682fe8946a97c08896109508 -BUILDCHAIN=autotools - diff --git a/deal.II-toolchain/packages/opencascade.package b/deal.II-toolchain/packages/opencascade.package index 1e5417e..30ae641 100644 --- a/deal.II-toolchain/packages/opencascade.package +++ b/deal.II-toolchain/packages/opencascade.package @@ -27,12 +27,14 @@ fi BUILDCHAIN=cmake -CONFOPTS="-D OCE_INSTALL_PREFIX=${INSTALL_PATH}/${NAME} \ +INSTALL_PATH=${INSTALL_PATH}/${NAME} + +CONFOPTS="-D OCE_INSTALL_PREFIX=${INSTALL_PATH} \ -D OCE_VISUALISATION=OFF \ -D OCE_DATAEXCHANGE=ON \ -D OCE_OCAF=OFF \ " package_specific_register () { - export OPENCASCADE_DIR=${INSTALL_PATH}/${NAME} + export OPENCASCADE_DIR=${INSTALL_PATH} } diff --git a/deal.II-toolchain/packages/p4est.package b/deal.II-toolchain/packages/p4est.package index 47e8e49..5f867b9 100644 --- a/deal.II-toolchain/packages/p4est.package +++ b/deal.II-toolchain/packages/p4est.package @@ -6,6 +6,8 @@ PACKING=.tar.gz CHECKSUM=37ba7f4410958cfb38a2140339dbf64f BUILDCHAIN=custom +INSTALL_PATH=${INSTALL_PATH}/${NAME} + package_specific_setup () { function bdie () { echo "Error: $@" @@ -31,8 +33,8 @@ package_specific_setup () { BUILD_DEBUG="${BUILD_PATH}/${NAME}/DEBUG" # choose names for fast and debug installation directories - INSTALL_FAST="${INSTALL_PATH}/${NAME}/FAST" - INSTALL_DEBUG="${INSTALL_PATH}/${NAME}/DEBUG" + INSTALL_FAST="${INSTALL_PATH}/FAST" + INSTALL_DEBUG="${INSTALL_PATH}/DEBUG" echo echo "This script tries configure and build the p4est library." @@ -82,10 +84,10 @@ package_specific_setup () { echo cd "${BUILD_PATH}/${NAME}" - touch dorsal_successful_build + touch candi_successful_build } package_specific_register () { - export P4EST_DIR=${INSTALL_PATH}/${NAME} + export P4EST_DIR=${INSTALL_PATH} } diff --git a/deal.II-toolchain/packages/parmetis.package b/deal.II-toolchain/packages/parmetis.package index 602c37a..57ae8b2 100644 --- a/deal.II-toolchain/packages/parmetis.package +++ b/deal.II-toolchain/packages/parmetis.package @@ -4,6 +4,8 @@ PACKING=.tar.gz CHECKSUM=f69c479586bf6bb7aff6a9bc0c739628 BUILDCHAIN=custom +INSTALL_PATH=${INSTALL_PATH}/${NAME} + package_specific_build() { cp -rf ${UNPACK_PATH}/${EXTRACTSTO}/* . cd metis @@ -17,6 +19,6 @@ package_specific_build() { } package_specific_register () { - export PARMETIS_DIR=${INSTALL_PATH} export METIS_DIR=${INSTALL_PATH} + export PARMETIS_DIR=${INSTALL_PATH} } diff --git a/deal.II-toolchain/packages/petsc.package b/deal.II-toolchain/packages/petsc.package index 8040532..f3e2b96 100644 --- a/deal.II-toolchain/packages/petsc.package +++ b/deal.II-toolchain/packages/petsc.package @@ -3,9 +3,10 @@ NAME=petsc-${VERSION} SOURCE=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/ PACKING=.tar.gz CHECKSUM=28f842697159e16e2978732480571147 -#CHECKSUM=ignore BUILDCHAIN=custom +INSTALL_PATH=${INSTALL_PATH}/${NAME} + ######################################################################### CONFOPTS=" @@ -54,6 +55,6 @@ package_specific_setup () { } package_specific_register () { - export PETSC_DIR=${INSTALL_PATH}/${NAME} + export PETSC_DIR=${INSTALL_PATH} } diff --git a/deal.II-toolchain/packages/slepc.package b/deal.II-toolchain/packages/slepc.package index 10fc3c3..dbae55b 100644 --- a/deal.II-toolchain/packages/slepc.package +++ b/deal.II-toolchain/packages/slepc.package @@ -3,18 +3,18 @@ NAME=slepc-${VERSION} SOURCE=http://www.grycap.upv.es/slepc/download/download.php?filename= PACKING=.tar.gz CHECKSUM=560a634369fdab3fcaeea35c2cbab6f1 -#CHECKSUM=ignore BUILDCHAIN=custom +INSTALL_PATH=${INSTALL_PATH}/${NAME} + package_specific_setup () { cd ${BUILDDIR} cp -rf ${UNPACK_PATH}/${EXTRACTSTO}/* . - ./configure --prefix=${INSTALL_PATH}/${NAME} ${CONFOPTS} + ./configure --prefix=${INSTALL_PATH} ${CONFOPTS} make SLEPC_DIR=$PWD PETSC_DIR=${PETSC_DIR} all install } package_specific_register () { - export SLEPC_DIR=${INSTALL_PATH}/${NAME} + export SLEPC_DIR=${INSTALL_PATH} } - diff --git a/deal.II-toolchain/packages/superlu_dist.package b/deal.II-toolchain/packages/superlu_dist.package index 7a5119a..6fedc42 100644 --- a/deal.II-toolchain/packages/superlu_dist.package +++ b/deal.II-toolchain/packages/superlu_dist.package @@ -3,10 +3,11 @@ NAME=superlu_dist_${VERSION} EXTRACTSTO=SuperLU_DIST_${VERSION} SOURCE=http://crd-legacy.lbl.gov/~xiaoye/SuperLU/ PACKING=.tar.gz -DOWNLOADER=curl CHECKSUM=4edee38cc29f687bd0c8eb361096a455 BUILDCHAIN=custom +INSTALL_PATH=${INSTALL_PATH}/${NAME} + package_specific_build() { cp -rf ${UNPACK_PATH}/${EXTRACTSTO}/* . diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package index 9b6df4a..6a59866 100644 --- a/deal.II-toolchain/packages/trilinos.package +++ b/deal.II-toolchain/packages/trilinos.package @@ -24,9 +24,10 @@ fi NAME=trilinos-${VERSION}-Source PACKING=.tar.bz2 -DOWNLOADER=curl BUILDCHAIN=cmake +INSTALL_PATH=${INSTALL_PATH}/${NAME} + ######################################################################### # If you have further options for trilinos, please set: #TRILINOS_CONFOPTS="" @@ -108,8 +109,6 @@ fi ######################################################################### # General Trilinos configuration -INSTALL_PATH=${INSTALL_PATH}/trilinos-${VERSION} - CONFOPTS="${TRILINOS_CONFOPTS} \ ${CONFOPTS} \ -D TPL_ENABLE_MPI:BOOL=ON \ @@ -129,4 +128,3 @@ CONFOPTS="${TRILINOS_CONFOPTS} \ package_specific_register () { export TRILINOS_DIR=${INSTALL_PATH} } - diff --git a/deal.II-toolchain/packages/zlib.package b/deal.II-toolchain/packages/zlib.package index 5e590ab..7e0f3cb 100644 --- a/deal.II-toolchain/packages/zlib.package +++ b/deal.II-toolchain/packages/zlib.package @@ -4,13 +4,15 @@ PACKING=.tar.gz CHECKSUM=44d667c142d7cda120332623eab69f40 BUILDCHAIN=custom +INSTALL_PATH=${INSTALL_PATH}/${NAME} + package_specific_build () { cp -rf ${UNPACK_PATH}/${NAME}/* . ./configure --prefix=${INSTALL_PATH} make install } - + package_specific_register () { export ZLIB_DIR=${INSTALL_PATH}/ export ZLIB_INCLUDE=${INSTALL_PATH}/include -- 2.39.5