Changed the NCHOLMOD define in the autotools patch to fix bug #319841

(Portage version: 2.2_rc67/cvs/Linux x86_64)

2 files changed, 13 insertions, 8 deletions

diff --git a/sci-libs/umfpack/ChangeLog b/sci-libs/umfpack/ChangeLog
index 6529a47890e4..ecb4d103a2fb 100644
--- a/sci-libs/umfpack/ChangeLog
+++ b/sci-libs/umfpack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/umfpack
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/ChangeLog,v 1.18 2010/05/14 21:46:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/ChangeLog,v 1.19 2010/05/16 15:22:50 bicatali Exp $
+
+  16 May 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  files/umfpack-5.5.0-autotools.patch:
+  Changed the NCHOLMOD define in the autotools patch to fix bug #319841
 
 *umfpack-5.5.0 (14 May 2010)
 
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