diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2010-05-16 15:22:50 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2010-05-16 15:22:50 +0000 |
| commit | f57a68aee6964fb5da3c2be12ff903084e9ab72b (patch) | |
| tree | 431a0da63f2e135c30f37ac9d22d935f70cfbd29 /sci-libs/umfpack/files | |
| parent | Fix maintainer's email (diff) | |
| download | gentoo-2-f57a68aee6964fb5da3c2be12ff903084e9ab72b.tar.gz gentoo-2-f57a68aee6964fb5da3c2be12ff903084e9ab72b.tar.bz2 gentoo-2-f57a68aee6964fb5da3c2be12ff903084e9ab72b.zip | |
Changed the NCHOLMOD define in the autotools patch to fix bug #319841
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/umfpack/files')
| -rw-r--r-- | sci-libs/umfpack/files/umfpack-5.5.0-autotools.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sci-libs/umfpack/files/umfpack-5.5.0-autotools.patch b/sci-libs/umfpack/files/umfpack-5.5.0-autotools.patch index 44db752f45c5..3da771940d66 100644 --- a/sci-libs/umfpack/files/umfpack-5.5.0-autotools.patch +++ b/sci-libs/umfpack/files/umfpack-5.5.0-autotools.patch @@ -1,6 +1,6 @@ diff -Nur UMFPACK.orig/acx_blas.m4 UMFPACK/acx_blas.m4 --- UMFPACK.orig/acx_blas.m4 1970-01-01 01:00:00.000000000 +0100 -+++ UMFPACK/acx_blas.m4 2010-05-14 20:54:52.000000000 +0100 ++++ UMFPACK/acx_blas.m4 2010-05-16 16:36:04.000000000 +0100 @@ -0,0 +1,191 @@ +##### http://autoconf-archive.cryp.to/acx_blas.html +# @@ -195,8 +195,8 @@ diff -Nur UMFPACK.orig/acx_blas.m4 UMFPACK/acx_blas.m4 +])dnl ACX_BLAS diff -Nur UMFPACK.orig/configure.ac UMFPACK/configure.ac --- UMFPACK.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ UMFPACK/configure.ac 2010-05-14 20:55:11.000000000 +0100 -@@ -0,0 +1,44 @@ ++++ UMFPACK/configure.ac 2010-05-16 16:37:29.000000000 +0100 +@@ -0,0 +1,45 @@ +# -*- Autoconf -*- +AC_PREREQ(2.59) +AC_INIT(umfpack, 5.5.0, davis@cise.ufl.edu) @@ -231,6 +231,7 @@ diff -Nur UMFPACK.orig/configure.ac UMFPACK/configure.ac + AC_CHECK_LIB(metis, METIS_NodeND, [METIS_LIBS=-lmetis], \ + [AC_MSG_ERROR([CHOLMOD needs metis. Cannot find libmetis])]) + fi ++else + AC_DEFINE(NCHOLMOD) +fi +AM_CONDITIONAL([CHOLMOD], [test x$with_cholmod = xyes]) @@ -243,7 +244,7 @@ diff -Nur UMFPACK.orig/configure.ac UMFPACK/configure.ac +AC_OUTPUT diff -Nur UMFPACK.orig/Demo/Makefile.am UMFPACK/Demo/Makefile.am --- UMFPACK.orig/Demo/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ UMFPACK/Demo/Makefile.am 2010-05-14 20:54:52.000000000 +0100 ++++ UMFPACK/Demo/Makefile.am 2010-05-16 16:36:04.000000000 +0100 @@ -0,0 +1,44 @@ +AM_CPPFLAGS = -I$(top_srcdir)/Include +LDADD = $(top_builddir)/Source/libumfpack.la @@ -291,7 +292,7 @@ diff -Nur UMFPACK.orig/Demo/Makefile.am UMFPACK/Demo/Makefile.am + fi diff -Nur UMFPACK.orig/Include/Makefile.am UMFPACK/Include/Makefile.am --- UMFPACK.orig/Include/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ UMFPACK/Include/Makefile.am 2010-05-14 20:54:52.000000000 +0100 ++++ UMFPACK/Include/Makefile.am 2010-05-16 16:36:04.000000000 +0100 @@ -0,0 +1,34 @@ +include_HEADERS = \ + umfpack.h \ @@ -329,13 +330,13 @@ diff -Nur UMFPACK.orig/Include/Makefile.am UMFPACK/Include/Makefile.am + umfpack_wsolve.h diff -Nur UMFPACK.orig/Makefile.am UMFPACK/Makefile.am --- UMFPACK.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ UMFPACK/Makefile.am 2010-05-14 20:54:52.000000000 +0100 ++++ UMFPACK/Makefile.am 2010-05-16 16:36:04.000000000 +0100 @@ -0,0 +1,2 @@ +SUBDIRS = Source Include Demo +EXTRA_DIST = README.txt diff -Nur UMFPACK.orig/Source/Makefile.am UMFPACK/Source/Makefile.am --- UMFPACK.orig/Source/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ UMFPACK/Source/Makefile.am 2010-05-14 20:54:52.000000000 +0100 ++++ UMFPACK/Source/Makefile.am 2010-05-16 16:36:04.000000000 +0100 @@ -0,0 +1,221 @@ +AM_CPPFLAGS = -I$(top_srcdir)/Include +lib_LTLIBRARIES = libumfpack.la |