Package: deal.ii / 6.3.1-1

trilinos-debian.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
Add the Debian package's trilinos_ prefix to library names.

Index: deal.ii-6.3.1/aclocal.m4
===================================================================
--- deal.ii-6.3.1.orig/aclocal.m4	2010-07-22 13:05:14.000000000 +0200
+++ deal.ii-6.3.1/aclocal.m4	2010-07-22 13:05:21.000000000 +0200
@@ -6032,7 +6032,7 @@
   dnl Check using the epetra library since that should always be there
 
   AC_MSG_CHECKING(whether Trilinos uses shared libraries)
-  if test -f $DEAL_II_TRILINOS_LIBDIR/libepetra${shared_lib_suffix} ; then
+  if test -f $DEAL_II_TRILINOS_LIBDIR/libtrilinos_epetra${shared_lib_suffix} ; then
     AC_MSG_RESULT(yes)
     DEAL_II_TRILINOS_SHARED=yes
   else
@@ -6040,7 +6040,7 @@
   fi
 
   AC_MSG_CHECKING(whether Trilinos uses static libraries)
-  if test -f $DEAL_II_TRILINOS_LIBDIR/libepetra${static_lib_suffix} ; then
+  if test -f $DEAL_II_TRILINOS_LIBDIR/libtrilinos_epetra${static_lib_suffix} ; then
     AC_MSG_RESULT(yes)
     DEAL_II_TRILINOS_STATIC=yes
   else
@@ -6177,8 +6177,7 @@
                     Epetra_SerialComm.h \
                     Epetra_Vector.h \
                     Ifpack.h \
-                    ml_MultiLevelPreconditioner.h \
-                    Sacado.hpp \
+		    Sacado.hpp \
                     Teuchos_ParameterList.hpp \
                     Teuchos_RCP.hpp \
                     Teuchos_RefCountPtr.hpp
Index: deal.ii-6.3.1/common/Make.global_options.in
===================================================================
--- deal.ii-6.3.1.orig/common/Make.global_options.in	2010-07-22 13:05:02.000000000 +0200
+++ deal.ii-6.3.1/common/Make.global_options.in	2010-07-22 13:05:21.000000000 +0200
@@ -205,11 +205,11 @@
 
   ifeq ($(enable-shared),yes)
     lib-contrib-trilinos = \
-       $(addsuffix $(shared-lib-suffix), $(addprefix $(DEAL_II_TRILINOS_LIBDIR)/lib, \
+       $(addsuffix $(shared-lib-suffix), $(addprefix $(DEAL_II_TRILINOS_LIBDIR)/libtrilinos_, \
                                                      $(DEAL_II_TRILINOS_LIBS)))
   else
     lib-contrib-trilinos = \
-       $(addsuffix $(static-lib-suffix), $(addprefix $(DEAL_II_TRILINOS_LIBDIR)/lib, \
+       $(addsuffix $(static-lib-suffix), $(addprefix $(DEAL_II_TRILINOS_LIBDIR)/libtrilinos_, \
                                                      $(DEAL_II_TRILINOS_LIBS)))
   endif
 endif