From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Thu, 10 Sep 2015 08:56:38 +0000 (+0200)
Subject: Issue #16 : this fix closes issue #16; addionally Amesos2 is now compiling
X-Git-Tag: v0.7~25
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8c00759a105890703eed745deadb9b21ab137b2;p=candi.git

Issue #16 : this fix closes issue #16; addionally Amesos2 is now compiling
---

diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package
index 4d6b464..dc9730c 100644
--- a/deal.II/packages/trilinos.package
+++ b/deal.II/packages/trilinos.package
@@ -14,12 +14,13 @@ CONFOPTS="${TRILINOS_CONFOPTS} \
           -D Trilinos_ENABLE_Stratimikos:BOOL=ON \
           -D Trilinos_ENABLE_Belos:BOOL=ON \
           -D Trilinos_ENABLE_MueLu:BOOL=ON \
-          -D Trilinos_ENABLE_Amesos2:BOOL=OFF \
+          -D Trilinos_ENABLE_Amesos2:BOOL=ON \
           -D TPL_ENABLE_ParMETIS:BOOL=${ParMETIS} \
           -D TPL_ParMETIS_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libparmetis.so \
           -D TPL_ENABLE_SuperLUDist:BOOL=${SuperLUDist} \
           -D TPL_SuperLUDist_LIBRARIES:FILEPATH=${INSTALL_PATH}/lib/libsuperlu_dist.so \
           -D SuperLUDist_INCLUDE_DIRS:PATH=${INSTALL_PATH}/include/superlu \
+          -D HAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG:BOOL=ON \
           -D CMAKE_BUILD_TYPE:STRING=RELEASE \
           -D CMAKE_CXX_FLAGS:STRING=-fPIC -g -O3 \
           -D CMAKE_C_FLAGS:STRING=-fPIC -g -O3 \
@@ -30,12 +31,6 @@ CONFOPTS="${TRILINOS_CONFOPTS} \
           -D TPL_ENABLE_MPI:BOOL=ON \
           -D BUILD_SHARED_LIBS:BOOL=ON"
 
-package_specific_setup() {
-    # Apply patch to let Trilinos/Amesos work with SuperLU_Dist v4.1
-    cd ${UNPACK_PATH}/${EXTRACTSTO}/packages/amesos/src
-    patch --forward Amesos_Superludist.cpp < ${ORIG_DIR}/${PROJECT}/patches/Amesos_Superludist.cpp.patch || true
-}
-
 package_specific_register () {
     export TRILINOS_DIR=${INSTALL_PATH}
 }
diff --git a/deal.II/patches/Amesos_Superludist.cpp.patch b/deal.II/patches/Amesos_Superludist.cpp.patch
deleted file mode 100644
index cd27da7..0000000
--- a/deal.II/patches/Amesos_Superludist.cpp.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-444a445
-> #define HAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG