Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sci-libs
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/spqr/ChangeLog7
-rw-r--r--sci-libs/spqr/files/spqr-1.1.0-autotools.patch145
-rw-r--r--sci-libs/spqr/spqr-1.1.0.ebuild5
3 files changed, 82 insertions, 75 deletions
diff --git a/sci-libs/spqr/ChangeLog b/sci-libs/spqr/ChangeLog
index 16f667b4e0b3..5d107a6dcf53 100644
--- a/sci-libs/spqr/ChangeLog
+++ b/sci-libs/spqr/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/spqr
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/ChangeLog,v 1.1 2009/03/14 12:19:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/ChangeLog,v 1.2 2009/10/23 03:48:29 markusle Exp $
+
+ 23 Oct 2009; Markus Dittrich <markusle@gentoo.org> spqr-1.1.0.ebuild,
+ files/spqr-1.1.0-autotools.patch:
+ Fixed as-needed issues and added dependencies on cholmod and friends
+ (bug #278198). Thanks much to Kacper Kowalik for his patches.
*spqr-1.1.0 (14 Mar 2009)
diff --git a/sci-libs/spqr/files/spqr-1.1.0-autotools.patch b/sci-libs/spqr/files/spqr-1.1.0-autotools.patch
index 599fa64a36a4..02e7f89f7395 100644
--- a/sci-libs/spqr/files/spqr-1.1.0-autotools.patch
+++ b/sci-libs/spqr/files/spqr-1.1.0-autotools.patch
@@ -1,64 +1,6 @@
-diff -Nur SPQR.orig/configure.ac SPQR/configure.ac
---- SPQR.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ SPQR/configure.ac 2009-03-14 11:20:10.319915444 +0000
-@@ -0,0 +1,54 @@
-+AC_PREREQ(2.59)
-+AC_INIT(spqr, 1.1.0, davis@cise.ufl.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_CONFIG_SRCDIR([Source/spqr_kernel.cpp])
-+AM_INIT_AUTOMAKE([foreign])
-+
-+AC_PROG_LIBTOOL
-+AC_PROG_CXX
-+AC_LANG(C++)
-+
-+AC_CHECK_LIB(m, sqrt)
-+AC_CHECK_HEADERS(UFconfig.h)
-+AC_CHECK_HEADERS(cholmod.h)
-+AC_CHECK_LIB(cholmod, cholmod_solve, [], \
-+ [AC_MSG_ERROR([Cannot find libcholmod])])
-+
-+AC_ARG_WITH(metis,
-+ [AC_HELP_STRING([--with-metis],
-+ [Use METIS for partitioning])],
-+ [with_metis=$withval],
-+ [with_metis="yes"])
-+if test x$with_metis = xyes; then
-+ PKG_PROG_PKG_CONFIG
-+ if test -n "$PKG_CONFIG"; then
-+ PKG_CHECK_MODULES([metis], [metis])
-+ else
-+ AC_CHECK_HEADERS(metis.h)
-+ AC_CHECK_LIB(metis, METIS_NodeND, [METIS_LIBS=-lmetis], \
-+ [AC_MSG_ERROR([Cannot find libmetis])])
-+ fi
-+ AC_DEFINE(NPARTITION)
-+fi
-+AM_CONDITIONAL([METIS], [test x$with_metis = xyes])
-+
-+AC_ARG_WITH(tbb,
-+ [AC_HELP_STRING([--with-tbb],
-+ [Use Intel Threading Building Block for multithreading])],
-+ [with_tbb=$withval],
-+ [with_tbb="yes"])
-+if test x$with_tbb = xyes; then
-+ AC_CHECK_HEADERS(tbb/task.h)
-+ TBB_CFLAGS=""
-+ TBB_LIBS="-ltbb"
-+ AC_SUBST(TBB_CFLAGS)
-+ AC_SUBST(TBB_LIBS)
-+ AC_DEFINE(HAVE_TBB)
-+fi
-+AM_CONDITIONAL([WITH_TBB], [test x$with_tbb = xyes])
-+
-+AC_CONFIG_FILES([Makefile
-+ Source/Makefile
-+ Include/Makefile
-+ Demo/Makefile])
-+AC_OUTPUT
-diff -Nur SPQR.orig/Demo/Makefile.am SPQR/Demo/Makefile.am
---- SPQR.orig/Demo/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ SPQR/Demo/Makefile.am 2009-03-14 11:03:44.580364074 +0000
+diff -Naur SPQR.orig/Demo/Makefile.am SPQR/Demo/Makefile.am
+--- SPQR.orig/Demo/Makefile.am 1969-12-31 19:00:00.000000000 -0500
++++ SPQR/Demo/Makefile.am 2009-10-22 23:42:08.000000000 -0400
@@ -0,0 +1,78 @@
+AM_CPPFLAGS = -I$(top_srcdir)/Include
+
@@ -138,24 +80,24 @@ diff -Nur SPQR.orig/Demo/Makefile.am SPQR/Demo/Makefile.am
+ ./qrdemoc < ../Matrix/GD98_a.mtx || exit 1
+ ./qrdemoc < ../Matrix/Ragusa16.mtx || exit 1
+ ./qrdemoc < ../Matrix/young1c.mtx || exit 1
-diff -Nur SPQR.orig/Include/Makefile.am SPQR/Include/Makefile.am
---- SPQR.orig/Include/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ SPQR/Include/Makefile.am 2009-03-14 10:56:08.933594972 +0000
+diff -Naur SPQR.orig/Include/Makefile.am SPQR/Include/Makefile.am
+--- SPQR.orig/Include/Makefile.am 1969-12-31 19:00:00.000000000 -0500
++++ SPQR/Include/Makefile.am 2009-10-22 23:42:08.000000000 -0400
@@ -0,0 +1,5 @@
+include_HEADERS = \
+ spqr.hpp \
+ SuiteSparseQR_C.h \
+ SuiteSparseQR_definitions.h \
+ SuiteSparseQR.hpp
-diff -Nur SPQR.orig/Makefile.am SPQR/Makefile.am
---- SPQR.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ SPQR/Makefile.am 2009-03-14 10:27:25.415020632 +0000
+diff -Naur SPQR.orig/Makefile.am SPQR/Makefile.am
+--- SPQR.orig/Makefile.am 1969-12-31 19:00:00.000000000 -0500
++++ SPQR/Makefile.am 2009-10-22 23:42:08.000000000 -0400
@@ -0,0 +1,2 @@
+SUBDIRS = Include Source Demo
+EXTRA_DIST = README.txt
-diff -Nur SPQR.orig/Source/Makefile.am SPQR/Source/Makefile.am
---- SPQR.orig/Source/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ SPQR/Source/Makefile.am 2009-03-14 10:10:07.617029851 +0000
+diff -Naur SPQR.orig/Source/Makefile.am SPQR/Source/Makefile.am
+--- SPQR.orig/Source/Makefile.am 1969-12-31 19:00:00.000000000 -0500
++++ SPQR/Source/Makefile.am 2009-10-22 23:43:03.000000000 -0400
@@ -0,0 +1,48 @@
+AM_CPPFLAGS=-I$(top_srcdir)/Include
+
@@ -203,5 +145,64 @@ diff -Nur SPQR.orig/Source/Makefile.am SPQR/Source/Makefile.am
+ spqr_type.cpp \
+ spqr_tol.cpp
+
-+libspqr_la_CPPFLAGS = $(AM_CPPFLAGS) $(METIS_CFLAGS) $(TBB_CFLAGS)
-+libspqr_la_LIBADD = $(METIS_LIBS) $(TBB_LIBS)
++libspqr_la_CPPFLAGS = $(AM_CPPFLAGS) $(METIS_CFLAGS) $(TBB_CFLAGS) $(LAPACK_CFLAGS)
++libspqr_la_LIBADD = $(METIS_LIBS) $(TBB_LIBS) $(LAPACK_LIBS)
+diff -Naur SPQR.orig/configure.ac SPQR/configure.ac
+--- SPQR.orig/configure.ac 1969-12-31 19:00:00.000000000 -0500
++++ SPQR/configure.ac 2009-10-22 23:42:32.000000000 -0400
+@@ -0,0 +1,55 @@
++AC_PREREQ(2.59)
++AC_INIT(spqr, 1.1.0, davis@cise.ufl.edu)
++AM_INIT_AUTOMAKE([foreign])
++AC_CONFIG_SRCDIR([Source/spqr_kernel.cpp])
++AM_INIT_AUTOMAKE([foreign])
++
++AC_PROG_LIBTOOL
++AC_PROG_CXX
++AC_LANG(C++)
++
++AC_CHECK_LIB(m, sqrt)
++AC_CHECK_LIB(lapack,zlarft_)
++AC_CHECK_HEADERS(UFconfig.h)
++AC_CHECK_HEADERS(cholmod.h)
++AC_CHECK_LIB(cholmod, cholmod_solve, [], \
++ [AC_MSG_ERROR([Cannot find libcholmod])])
++
++AC_ARG_WITH(metis,
++ [AC_HELP_STRING([--with-metis],
++ [Use METIS for partitioning])],
++ [with_metis=$withval],
++ [with_metis="yes"])
++if test x$with_metis = xyes; then
++ PKG_PROG_PKG_CONFIG
++ if test -n "$PKG_CONFIG"; then
++ PKG_CHECK_MODULES([metis], [metis])
++ else
++ AC_CHECK_HEADERS(metis.h)
++ AC_CHECK_LIB(metis, METIS_NodeND, [METIS_LIBS=-lmetis], \
++ [AC_MSG_ERROR([Cannot find libmetis])])
++ fi
++ AC_DEFINE(NPARTITION)
++fi
++AM_CONDITIONAL([METIS], [test x$with_metis = xyes])
++
++AC_ARG_WITH(tbb,
++ [AC_HELP_STRING([--with-tbb],
++ [Use Intel Threading Building Block for multithreading])],
++ [with_tbb=$withval],
++ [with_tbb="yes"])
++if test x$with_tbb = xyes; then
++ AC_CHECK_HEADERS(tbb/task.h)
++ TBB_CFLAGS=""
++ TBB_LIBS="-ltbb"
++ AC_SUBST(TBB_CFLAGS)
++ AC_SUBST(TBB_LIBS)
++ AC_DEFINE(HAVE_TBB)
++fi
++AM_CONDITIONAL([WITH_TBB], [test x$with_tbb = xyes])
++
++AC_CONFIG_FILES([Makefile
++ Source/Makefile
++ Include/Makefile
++ Demo/Makefile])
++AC_OUTPUT
diff --git a/sci-libs/spqr/spqr-1.1.0.ebuild b/sci-libs/spqr/spqr-1.1.0.ebuild
index ce9d12acc037..e34745952ee1 100644
--- a/sci-libs/spqr/spqr-1.1.0.ebuild
+++ b/sci-libs/spqr/spqr-1.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/spqr-1.1.0.ebuild,v 1.1 2009/03/14 12:19:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/spqr-1.1.0.ebuild,v 1.2 2009/10/23 03:48:29 markusle Exp $
EAPI=2
inherit eutils autotools
@@ -14,7 +14,8 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc metis tbb"
-RDEPEND="tbb? ( dev-cpp/tbb )
+RDEPEND="sci-libs/cholmod[supernodal]
+ tbb? ( dev-cpp/tbb )
metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] )"
DEPEND="${RDEPEND}
dev-util/pkgconfig"