| 1 |
bicatali 08/03/28 12:20:04 |
| 2 |
|
| 3 |
Modified: cholmod-1.6.0-autotools.patch |
| 4 |
Log: |
| 5 |
Fixed header locations for metis, added support for pkg-config for lapack and metis, cleaned up autotools and ebuild |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sci-libs/cholmod/files/cholmod-1.6.0-autotools.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cholmod/files/cholmod-1.6.0-autotools.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cholmod/files/cholmod-1.6.0-autotools.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cholmod/files/cholmod-1.6.0-autotools.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: cholmod-1.6.0-autotools.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cholmod/files/cholmod-1.6.0-autotools.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- cholmod-1.6.0-autotools.patch 5 Feb 2008 18:28:01 -0000 1.1 |
| 22 |
+++ cholmod-1.6.0-autotools.patch 28 Mar 2008 12:20:04 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
--- configure.ac 1970-01-01 01:00:00.000000000 +0100 |
| 25 |
-+++ configure.ac 2008-02-01 19:12:59.582510299 +0000 |
| 26 |
-@@ -0,0 +1,137 @@ |
| 27 |
++++ configure.ac 2008-03-28 11:20:10.017415063 +0000 |
| 28 |
+@@ -0,0 +1,142 @@ |
| 29 |
+# -*- Autoconf -*- |
| 30 |
+AC_PREREQ(2.59) |
| 31 |
+AC_INIT(cholmod, 1.6.0, davis@××××××××.edu) |
| 32 |
@@ -16,42 +16,42 @@ |
| 33 |
+ [build the check module])], |
| 34 |
+ [mod_check=$enableval], |
| 35 |
+ [mod_check="yes"]) |
| 36 |
-+AC_MSG_RESULT($mod_check) |
| 37 |
++AC_MSG_RESULT([Enabling mod-check: $mod_check]) |
| 38 |
+ |
| 39 |
+AC_ARG_ENABLE(mod-cholesky, |
| 40 |
+ [AC_HELP_STRING([--enable-mod-cholesky], |
| 41 |
+ [build the cholesky module])], |
| 42 |
+ [mod_cholesky=$enableval], |
| 43 |
+ [mod_cholesky="yes"]) |
| 44 |
-+AC_MSG_RESULT($mod_cholesky) |
| 45 |
++AC_MSG_RESULT([Enabling mod-cholesku: $mod_cholesky]) |
| 46 |
+ |
| 47 |
+AC_ARG_ENABLE(mod-partition, |
| 48 |
+ [AC_HELP_STRING([--enable-mod-partition], |
| 49 |
+ [build the partition module])], |
| 50 |
+ [mod_partition=$enableval], |
| 51 |
+ [mod_partition="yes"]) |
| 52 |
-+AC_MSG_RESULT($mod_partition) |
| 53 |
++AC_MSG_RESULT([Enabling mod-partition: $mod_partition]) |
| 54 |
+ |
| 55 |
+AC_ARG_ENABLE(mod-matrixops, |
| 56 |
+ [AC_HELP_STRING([--enable-mod-matrixops], |
| 57 |
+ [build the matrixops module])], |
| 58 |
+ [mod_matrixops=$enableval], |
| 59 |
+ [mod_matrixops="yes"]) |
| 60 |
-+AC_MSG_RESULT($mod_matrixops) |
| 61 |
++AC_MSG_RESULT([Enabling mod-matrixops: $mod_matrixops]) |
| 62 |
+ |
| 63 |
+AC_ARG_ENABLE(mod-modify, |
| 64 |
+ [AC_HELP_STRING([--enable-mod-modify], |
| 65 |
+ [build the modify module])], |
| 66 |
+ [mod_modify=$enableval], |
| 67 |
+ [mod_modify="yes"]) |
| 68 |
-+AC_MSG_RESULT($mod_modify) |
| 69 |
++AC_MSG_RESULT([Enabling mod-modify: $mod_modify]) |
| 70 |
+ |
| 71 |
+AC_ARG_ENABLE(mod-supernodal, |
| 72 |
+ [AC_HELP_STRING([--enable-mod-supernodal], |
| 73 |
+ [build the supernodal module])], |
| 74 |
+ [mod_supernodal=$enableval], |
| 75 |
+ [mod_supernodal="yes"]) |
| 76 |
-+AC_MSG_RESULT($mod_supernodal) |
| 77 |
++AC_MSG_RESULT([Enabling mod-supernoda: $mod_supernodal]) |
| 78 |
+ |
| 79 |
+if test x$mod_check = xno; then |
| 80 |
+ AC_DEFINE(NCHECK) |
| 81 |
@@ -69,9 +69,14 @@ |
| 82 |
+ AC_DEFINE(NPARTITION) |
| 83 |
+else |
| 84 |
+ MODULES="$MODULES Partition" |
| 85 |
-+ AC_CHECK_HEADERS(metis.h) |
| 86 |
-+ AC_CHECK_LIB(metis, METIS_NodeND, [], \ |
| 87 |
-+ [AC_MSG_ERROR([Cannot find libmetis])]) |
| 88 |
++ PKG_PROG_PKG_CONFIG |
| 89 |
++ if test -n "$PKG_CONFIG"; then |
| 90 |
++ PKG_CHECK_MODULES([metis], [metis]) |
| 91 |
++ else |
| 92 |
++ AC_CHECK_HEADERS(metis.h) |
| 93 |
++ AC_CHECK_LIB(metis, METIS_NodeND, [metis_LIBS=-lmetis], \ |
| 94 |
++ [AC_MSG_ERROR([Cannot find libmetis])]) |
| 95 |
++ fi |
| 96 |
+ |
| 97 |
+ AC_CHECK_HEADERS(ccolamd.h) |
| 98 |
+ AC_CHECK_LIB(ccolamd, ccolamd_report, [], \ |
| 99 |
@@ -615,16 +620,16 @@ |
| 100 |
+ cholmod_core.h \ |
| 101 |
+ cholmod_io64.h |
| 102 |
--- ./Partition/Makefile.am 1970-01-01 01:00:00.000000000 +0100 |
| 103 |
-+++ ./Partition/Makefile.am 2008-02-01 18:53:12.292468792 +0000 |
| 104 |
++++ ./Partition/Makefile.am 2008-03-28 11:18:36.527105814 +0000 |
| 105 |
@@ -0,0 +1,6 @@ |
| 106 |
-+AM_CPPFLAGS = -I$(top_srcdir)/Include |
| 107 |
++AM_CPPFLAGS = -I$(top_srcdir)/Include @metis_CFLAGS@ |
| 108 |
+noinst_LTLIBRARIES = libpart.la libpartl.la |
| 109 |
+libpart_la_SOURCES = cholmod_camd.c cholmod_csymamd.c cholmod_nesdis.c cholmod_ccolamd.c cholmod_metis.c |
| 110 |
+ |
| 111 |
+libpartl_la_SOURCES = $(libpart_la_SOURCES) |
| 112 |
+libpartl_la_CPPFLAGS = $(AM_CPPFLAGS) -DDLONG |
| 113 |
--- ./Makefile.am 1970-01-01 01:00:00.000000000 +0100 |
| 114 |
-+++ ./Makefile.am 2008-02-01 18:53:12.288468564 +0000 |
| 115 |
++++ ./Makefile.am 2008-03-28 11:20:54.705608972 +0000 |
| 116 |
@@ -0,0 +1,42 @@ |
| 117 |
+SUBDIRS = Include Demo Core $(MODULES) |
| 118 |
+EXTRA_DIST = README.txt |
| 119 |
@@ -644,7 +649,7 @@ |
| 120 |
+if MOD_PARTITION |
| 121 |
+PARTITION = $(top_builddir)/Partition/libpart.la \ |
| 122 |
+ $(top_builddir)/Partition/libpartl.la \ |
| 123 |
-+ -lmetis -lccolamd -lcamd |
| 124 |
++ @metis_LIBS@ -lccolamd -lcamd |
| 125 |
+endif |
| 126 |
+ |
| 127 |
+if MOD_MATRIXOPS |
| 128 |
|
| 129 |
|
| 130 |
|
| 131 |
-- |
| 132 |
gentoo-commits@l.g.o mailing list |
Archives