| 1 |
commit: 4b1440543f9105301337cd671a6e7e563db64b73 |
| 2 |
Author: Jens-Malte Gottfried <jmgottfried <AT> web <DOT> de> |
| 3 |
AuthorDate: Sun Mar 4 21:15:19 2012 +0000 |
| 4 |
Commit: Jens-Malte Gottfried <jmg <AT> godefridus <DOT> de> |
| 5 |
CommitDate: Sun Mar 4 21:15:19 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4b144054 |
| 7 |
|
| 8 |
added superlu on activated hypre flag |
| 9 |
|
| 10 |
since superlu is in the hypre depencencies anyway. |
| 11 |
Also switched to using the econf macro to have configure options |
| 12 |
displayed during build. |
| 13 |
|
| 14 |
--- |
| 15 |
sci-mathematics/petsc/metadata.xml | 4 ++-- |
| 16 |
sci-mathematics/petsc/petsc-3.2_p6.ebuild | 13 ++++++------- |
| 17 |
2 files changed, 8 insertions(+), 9 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-mathematics/petsc/metadata.xml b/sci-mathematics/petsc/metadata.xml |
| 20 |
index 9bbff56..10bb79f 100644 |
| 21 |
--- a/sci-mathematics/petsc/metadata.xml |
| 22 |
+++ b/sci-mathematics/petsc/metadata.xml |
| 23 |
@@ -4,10 +4,10 @@ |
| 24 |
<herd>sci-mathematics</herd> |
| 25 |
<use> |
| 26 |
<flag name="afterimage">Use Afterstep image library (media-libs/libafterimage)</flag> |
| 27 |
- <flag name="hypre">Use HYPRE (sci-mathematics/hypre) for preconditioning</flag> |
| 28 |
+ <flag name="hypre">Use HYPRE (sci-mathematics/hypre) and superlu (sci-libs/superlu) for preconditioning</flag> |
| 29 |
<flag name="metis">Use METIS (sci-libs/parmetis) for partitioning</flag> |
| 30 |
<flag name="complex-scalars">Make scalars complex</flag> |
| 31 |
- <flag name="sparse">Use cholmod and suitesparse for sparse factorization</flag> |
| 32 |
+ <flag name="sparse">Use suitesparse (sci-libs/suitesparse) including cholmod (sci-libs/cholmod) for sparse factorization</flag> |
| 33 |
<!-- Disabled: |
| 34 |
<flag name="boost">Use boost (dev-libs/boost)</flag> |
| 35 |
--> |
| 36 |
|
| 37 |
diff --git a/sci-mathematics/petsc/petsc-3.2_p6.ebuild b/sci-mathematics/petsc/petsc-3.2_p6.ebuild |
| 38 |
index 46a2344..23dc7ca 100644 |
| 39 |
--- a/sci-mathematics/petsc/petsc-3.2_p6.ebuild |
| 40 |
+++ b/sci-mathematics/petsc/petsc-3.2_p6.ebuild |
| 41 |
@@ -30,11 +30,11 @@ RDEPEND="mpi? ( virtual/mpi[cxx?,fortran?] ) |
| 42 |
X? ( x11-libs/libX11 ) |
| 43 |
virtual/lapack |
| 44 |
virtual/blas |
| 45 |
- hypre? ( sci-libs/hypre ) |
| 46 |
+ hypre? ( sci-libs/hypre sci-libs/superlu ) |
| 47 |
metis? ( sci-libs/parmetis ) |
| 48 |
hdf5? ( sci-libs/hdf5 ) |
| 49 |
afterimage? ( media-libs/libafterimage ) |
| 50 |
- sparse? ( sci-libs/suitesparse sci-libs/cholmod ) |
| 51 |
+ sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) |
| 52 |
" |
| 53 |
# boost? ( dev-libs/boost ) |
| 54 |
# imagemagick? ( media-gfx/imagemagick ) |
| 55 |
@@ -98,8 +98,7 @@ src_configure(){ |
| 56 |
fi |
| 57 |
|
| 58 |
# run petsc configure script |
| 59 |
- ./configure \ |
| 60 |
- --prefix="${EPREFIX}/usr" \ |
| 61 |
+ econf \ |
| 62 |
CFLAGS="${CFLAGS}" \ |
| 63 |
CXXFLAGS="${CXXFLAGS}" \ |
| 64 |
LDFLAGS="${LDFLAGS}" \ |
| 65 |
@@ -129,14 +128,14 @@ src_configure(){ |
| 66 |
/usr/$(get_libdir)/libAfterImage.so /usr/include/libAfterImage) \ |
| 67 |
$(petsc_with hdf5) \ |
| 68 |
$(petsc_with hypre hypre /usr/$(get_libdir)/libHYPRE.so /usr/include/hypre) \ |
| 69 |
+ $(petsc_with hypre superlu /usr/$(get_libdir)/libsuperlu.so /usr/include/superlu) \ |
| 70 |
$(petsc_with metis parmetis) \ |
| 71 |
$(petsc_with sparse cholmod) \ |
| 72 |
$(petsc_with X x) \ |
| 73 |
$(petsc_with X x11) \ |
| 74 |
- --with-scotch=0 \ |
| 75 |
- ${EXTRA_ECONF} || die "configuration failed" |
| 76 |
+ --with-scotch=0 |
| 77 |
|
| 78 |
-# failed dependencies, perhaps fixed in upstream: |
| 79 |
+# failed dependencies, perhaps fixed in upstream soon: |
| 80 |
# $(petsc_with boost) \ |
| 81 |
# $(petsc_with imagemagick imagemagick /usr/$(get_libdir)/libMagickCore.so /usr/include/ImageMagick) \ |
| 82 |
} |
Archives