From 452020679378101248c4e9bc82758a9a5117f240 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Fri, 11 Jul 2014 07:57:30 +0200 Subject: [PATCH] deal.II: SuperLU_DIST, patched SuperLU_DIST in a way, such that an shared lib build is done now, also updated the trilinos package to use the shared lib --- deal.II/packages/superlu_dist.package | 13 ++++++------- deal.II/packages/trilinos.package | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/deal.II/packages/superlu_dist.package b/deal.II/packages/superlu_dist.package index 24dc635..97252b1 100644 --- a/deal.II/packages/superlu_dist.package +++ b/deal.II/packages/superlu_dist.package @@ -4,14 +4,13 @@ EXTRACTSTO=SuperLU_DIST_${VERSION} SOURCE=http://crd-legacy.lbl.gov/~xiaoye/SuperLU/ PACKING=.tar.gz CHECKSUM=f4805659157d93a962500902c219046b -#1d77f10a265f5751d4e4b59317d778f8 superlu_dist_3.0.tar.gz -#5b114d6f97d9e94d643f51bb3c6cf03f superlu_dist_3.1.tar.gz -#b67bab5bb1ee92d38ad6c345b3c2b18d superlu_dist_3.2.tar.gz -#f4805659157d93a962500902c219046b superlu_dist_3.3.tar.gz BUILDCHAIN=custom package_specific_build() { cp -rf ${UNPACK_PATH}/${EXTRACTSTO}/* . + + patch -p1 < ${ORIG_DIR}/${PROJECT}/patches/SuperLU_DIST_3.3.patch + mv make.inc make.inc.bak #create make.inc echo "# The machine (platform) identifier to append to the library names @@ -22,7 +21,9 @@ PLAT = _x86_64 # The name of the libraries to be created/linked to # DSuperLUroot = ${INSTALL_PATH} -DSUPERLULIB = \$(DSuperLUroot)/lib/libsuperlu_dist_${VERSION}.a +DSUPERLULIBNAME = libsuperlu_dist +DSUPERLULIBDIR = \$(DSuperLUroot)/lib +DSUPERLULIB = \$(DSUPERLULIBDIR)/\$(DSUPERLULIBNAME) # BLASDEF = -DUSE_VENDOR_BLAS @@ -70,8 +71,6 @@ CDEFS = -DAdd_ # now compile superlu_dist make superlulib - rm -f ${INSTALL_PATH}/lib/libsuperlu_dist.a - ln -s ${INSTALL_PATH}/lib/libsuperlu_dist_${VERSION}.a ${INSTALL_PATH}/lib/libsuperlu_dist.a mkdir -p ${INSTALL_PATH}/include/superlu cp SRC/*.h ${INSTALL_PATH}/include/superlu } diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package index 476c5e8..40318d5 100644 --- a/deal.II/packages/trilinos.package +++ b/deal.II/packages/trilinos.package @@ -13,7 +13,7 @@ CONFOPTS="-D Trilinos_ENABLE_OpenMP:BOOL=OFF \ -D TPL_ENABLE_ParMETIS:BOOL=ON \ -D TPL_ParMETIS_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libparmetis.so \ -D TPL_ENABLE_SuperLUDist:BOOL=ON \ - -D TPL_SuperLUDist_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libsuperlu_dist_3.3.a \ + -D TPL_SuperLUDist_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libsuperlu_dist.so \ -D SuperLUDist_INCLUDE_DIRS:PATH=${INSTALL_PATH}/include/superlu \ -D CMAKE_BUILD_TYPE:STRING=RELEASE \ -D CMAKE_CXX_FLAGS:STRING=-fPIC -g -O3 \ -- 2.39.5