← Back to branch summary

~ubuntu-branches/ubuntu/vivid/deal.ii/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/umfpack.patch

  • Committer: Bazaar Package Importer
  • Author(s): Adam C. Powell, IV
  • Date: 2009-05-08 23:13:50 UTC
  • Revision ID: james.westby@ubuntu.com-20090508231350-y2bnbq7napm1eltt
Tags: 6.2.0-2
* Added Trilinos linkage.
* Changed compilers to mpicc and mpicxx to make trilinos tests work.
* Fixed library variables using a sed hack.
* Added PIC flag to soname test.
* Fixed a couple of other lintian warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/umfpack.patch
 
1
Make sure umfpack tests link -lamd as well.
 
2
 
 
3
--- deal.ii-6.2.0/aclocal.m4~   2009-05-05 22:04:26.000000000 -0400
 
4
+++ deal.ii-6.2.0/aclocal.m4    2009-05-05 22:04:51.000000000 -0400
 
5
@@ -6372,7 +6372,7 @@
 
6
       dnl Try old naming scheme for umfpack/amd libraries (before 
 
7
       dnl Tim Davis incorporated everything into SuiteSparse)
 
8
       OLD_LDFLAGS="$LDFLAGS"
 
9
-      LDFLAGS="-L${UMFPACK_DIR}/UMFPACK $LDFLAGS"
 
10
+      LDFLAGS="-L${UMFPACK_DIR}/UMFPACK -lamd $LDFLAGS"
 
11
       AC_CHECK_LIB(
 
12
         [umfpack], 
 
13
         [umfpack_di_defaults],
 
14
@@ -6384,7 +6384,7 @@
 
15
         ],
 
16
         [
 
17
           dnl Old naming scheme failed, try the new one
 
18
-          LDFLAGS="-L${UMFPACK_DIR}/lib $OLD_LDFLAGS"
 
19
+          LDFLAGS="-L${UMFPACK_DIR}/lib -lamd $OLD_LDFLAGS"
 
20
           AC_CHECK_LIB(
 
21
             [umfpack], 
 
22
             [umfpack_di_defaults],