commit: 494179192d98a4f101bd309aa256cb0693d71a2b
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Jan 18 09:00:04 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Jan 18 09:00:04 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=49417919
sci-libs/superlu_dist: version bump 6.4.0, fix fetch
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
.../files/superlu_dist-3.3-duplicate-symbols.patch | 70 -------------------
sci-libs/superlu_dist/superlu_dist-3.3.ebuild | 81 ----------------------
sci-libs/superlu_dist/superlu_dist-6.4.0.ebuild | 41 +++++++++++
3 files changed, 41 insertions(+), 151 deletions(-)
diff --git
a/sci-libs/superlu_dist/files/superlu_dist-3.3-duplicate-symbols.patch
b/sci-libs/superlu_dist/files/superlu_dist-3.3-duplicate-symbols.patch
deleted file mode 100644
index b27647d81..000000000
--- a/sci-libs/superlu_dist/files/superlu_dist-3.3-duplicate-symbols.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nur SRC.orig/dcomplex.c SRC/dcomplex.c
---- SRC.orig/dcomplex.c 2013-07-15 13:31:52.013335511 -0700
-+++ SRC/dcomplex.c 2013-07-15 13:41:52.346722312 -0700
-@@ -11,6 +11,7 @@
-
- #include <math.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include "dcomplex.h"
-
-
-diff -Nur SRC.orig/dreadtriple.c SRC/dreadtriple.c
---- SRC.orig/dreadtriple.c 2013-07-15 13:31:52.015335487 -0700
-+++ SRC/dreadtriple.c 2013-07-15 13:32:57.202697327 -0700
-@@ -150,21 +150,4 @@
- }
-
-
--void dreadrhs(int m, double *b)
--{
-- FILE *fp, *fopen();
-- int i, j;
--
-- if ( !(fp = fopen("b.dat", "r")) ) {
-- fprintf(stderr, "dreadrhs: file does not exist\n");
-- exit(-1);
-- }
-- for (i = 0; i < m; ++i)
-- fscanf(fp, "%lf\n", &b[i]);
-- /*fscanf(fp, "%d%lf\n", &j, &b[i]);*/
-- /* readpair_(j, &b[i]);*/
--
-- fclose(fp);
--}
--
-
-diff -Nur SRC.orig/xerbla.c SRC/xerbla.c
---- SRC.orig/xerbla.c 2013-07-15 13:31:52.016335478 -0700
-+++ SRC/xerbla.c 2013-07-15 13:51:47.522154563 -0700
-@@ -8,6 +8,7 @@
- September 30, 1994
- </pre>
- */
-+#include <stdio.h>
- #include "Cnames.h"
-
- /* Subroutine */
-diff -Nur SRC.orig/zreadtriple.c SRC/zreadtriple.c
---- SRC.orig/zreadtriple.c 2013-07-15 13:31:52.014335499 -0700
-+++ SRC/zreadtriple.c 2013-07-15 13:33:27.409864866 -0700
-@@ -149,19 +149,5 @@
- }
-
-
--void zreadrhs(int m, doublecomplex *b)
--{
-- FILE *fp, *fopen();
-- int i, j;
--
-- if ( !(fp = fopen("b.dat", "r")) ) {
-- fprintf(stderr, "zreadrhs: file does not exist\n");
-- exit(-1);
-- }
-- for (i = 0; i < m; ++i)
-- fscanf(fp, "%lf%lf\n", &(b[i].r), &(b[i].i));
--
-- fclose(fp);
--}
-
-
diff --git a/sci-libs/superlu_dist/superlu_dist-3.3.ebuild
b/sci-libs/superlu_dist/superlu_dist-3.3.ebuild
deleted file mode 100644
index 7be298297..000000000
--- a/sci-libs/superlu_dist/superlu_dist-3.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-MYPN=SuperLU_DIST
-
-DESCRIPTION="MPI distributed sparse LU factorization library"
-HOMEPAGE="https://crd.lbl.gov/~xiaoye/SuperLU/";
-SRC_URI="${HOMEPAGE}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
-
-RDEPEND="
- sci-libs/parmetis
- virtual/mpi"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MYPN}_${PV}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-duplicate-symbols.patch
-}
-
-src_configure() {
- sed -i \
- -e 's/^\(PLAT\s*=\).*/\1/' \
- -e "s:^\(CC\s*=\).*:\1 mpicc:" \
- -e "/CFLAGS/s:-fast -Mipa=fast,safe:${CFLAGS} \$(PIC):" \
- -e "s:^\(PREDEFS\s*=\).*:\1 ${CPPFLAGS} -DUSE_VENDOR_BLAS
\$(CTHREADS)$:" \
- -e "s:^\(NOOPTS\s*=.*\):\1 \$(PIC):" \
- -e "s:^\(FORTRAN\s*=\).*:\1 mpif77:" \
- -e "s:^\(F90FLAGS\s*=\).*:\1 ${FFLAGS} \$(PIC):" \
- -e "s:^\(ARCH\s*=\).*:\1 $(tc-getAR):" \
- -e "s:^\(RANLIB\s*=\).*:\1 $(tc-getRANLIB):" \
- -e "s:^\(LOADER\s*=\).*:\1 mpicc:" \
- -e "s:^\(LOADOPTS\s*=\).*:\1 ${LDFLAGS} \$(LDTHREADS):" \
- -e '/^FLIBS/d' \
- -e "s:^\(METISLIB\s*=\).*:\1 -lmetis:" \
- -e "s:^\(PARMETISLIB\s*=\).*:\1 -lparmetis:" \
- -e "s:^\(BLASLIB\s*=\).*:\1 $($(tc-getPKG_CONFIG) --libs
blas):" \
- -e "s:^\(DSUPERLULIB\s*=\).*:\1 ../lib/libsuperlu_dist.a:" \
- make.inc || die
- SONAME=libsuperlu_dist.so.0
- sed -i \
- -e 's|../make.inc|make.inc|' \
- -e "s|../SRC|${EPREFIX}/usr/include/${PN}|" \
- -e '/:.*$(DSUPERLULIB)/s|../lib/$(DSUPERLULIB)||g' \
- -e 's|../lib/$(DSUPERLULIB)|-lsuperlu_dist|g' \
- EXAMPLE/Makefile || die
-}
-
-src_compile() {
- emake superlulib \
- PIC="-fPIC" ARCH="echo" ARCHFLAGS="" RANLIB="echo"
- $(tc-getCC) ${LDFLAGS} ${LDTHREADS} -shared -Wl,-soname=${SONAME}
SRC/*.o \
- $($(tc-getPKG_CONFIG) --libs blas) -lm -o lib/${SONAME} || die
- ln -s ${SONAME} lib/libsuperlu_dist.so || die
-
- use static-libs && rm -f SRC/*.o && emake superlulib \
- PIC="" ARCH="$(tc-getAR)" ARCHFLAGS="cr"
RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
- dolib.so lib/*so*
- use static-libs && dolib.a lib/*.a
- insinto /usr/include/${PN}
- doins SRC/*h
- dodoc README
- use doc && dodoc DOC/ug.pdf
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r EXAMPLE/* make.inc
- fi
-}
diff --git a/sci-libs/superlu_dist/superlu_dist-6.4.0.ebuild
b/sci-libs/superlu_dist/superlu_dist-6.4.0.ebuild
new file mode 100644
index 000000000..9dfdb38d6
--- /dev/null
+++ b/sci-libs/superlu_dist/superlu_dist-6.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOCS_BUILDER="doxygen"
+DOCS_CONFIG_NAME="DoxyConfig"
+
+inherit cmake docs multilib
+
+MYPN=SuperLU_DIST
+
+DESCRIPTION="MPI distributed sparse LU factorization library"
+HOMEPAGE="https://portal.nersc.gov/project/sparse/superlu/
https://github.com/xiaoyeli/superlu_dist";
+SRC_URI="https://github.com/xiaoyeli/superlu_dist/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+ sci-libs/parmetis[mpi]
+ virtual/mpi"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ local mycmakeargs=(
+ -DTPL_PARMETIS_LIBRARIES="/usr/$(get_libdir)/libmetis.so"
+ -DTPL_PARMETIS_INCLUDE_DIRS="/usr/include/"
+ -Denable_examples=$(usex examples ON OFF)
+ -Denable_tests=$(usex test ON OFF)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ default
+}
