* [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/
@ 2012-03-12 16:35 Sebastien Fabbro
0 siblings, 0 replies; 11+ messages in thread
From: Sebastien Fabbro @ 2012-03-12 16:35 UTC (permalink / raw
To: gentoo-commits
commit: a5ae217a4042f08588e657bdf9414a12597bd1fe
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Mon Mar 12 16:35:36 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 16:35:36 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a5ae217a
imported mumps
---
sci-libs/mumps/ChangeLog | 14 ++++
sci-libs/mumps/metadata.xml | 13 ++++
sci-libs/mumps/mumps-4.10.0.ebuild | 141 ++++++++++++++++++++++++++++++++++++
3 files changed, 168 insertions(+), 0 deletions(-)
diff --git a/sci-libs/mumps/ChangeLog b/sci-libs/mumps/ChangeLog
new file mode 100644
index 0000000..66ba813
--- /dev/null
+++ b/sci-libs/mumps/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for sci-libs/mumps
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 12 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +mumps-4.10.0.ebuild,
+ +metadata.xml:
+ metis-mpi is now parmetis
+
+*mumps-4.10.0 (01 Jun 2011)
+
+ 01 Jun 2011; Sébastien Fabbro <bicatali@gentoo.org> +mumps-4.10.0.ebuild,
+ +metadata.xml:
+ Initial import
+
diff --git a/sci-libs/mumps/metadata.xml b/sci-libs/mumps/metadata.xml
new file mode 100644
index 0000000..e9804fe
--- /dev/null
+++ b/sci-libs/mumps/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<longdescription lang='en'>
+ MUltifrontal Massively Parallel sparse direct Solver implements a
+ direct solver for large sparse linear systems, with a particular
+ focus on symmetric positive definite matrices. It can operate on
+ distributed matrices e.g. over a cluster. It has Fortran and C
+ interfaces, and can interface with ordering tools such
+ as Scotch or Metis.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-libs/mumps/mumps-4.10.0.ebuild b/sci-libs/mumps/mumps-4.10.0.ebuild
new file mode 100644
index 0000000..e1c5015
--- /dev/null
+++ b/sci-libs/mumps/mumps-4.10.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils toolchain-funcs flag-o-matic versionator
+
+MYP=MUMPS_${PV}
+
+DESCRIPTION="MUltifrontal Massively Parallel sparse direct matrix Solver"
+HOMEPAGE="http://mumps.enseeiht.fr/"
+SRC_URI="${HOMEPAGE}${MYP}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples metis mpi +scotch static-libs"
+
+RDEPEND="virtual/blas
+ sci-libs/parmetis[mpi?]
+ scotch? ( sci-libs/scotch[mpi?] )
+ mpi? ( virtual/scalapack )"
+
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+make_shared_lib() {
+ local libstatic=${1}
+ local soname=$(basename "${1%.a}").so.$(get_major_version)
+ shift
+ einfo "Making ${soname}"
+ ${LINK:-$(tc-getCC)} ${LDFLAGS} \
+ -shared -Wl,-soname="${soname}" \
+ -Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \
+ "$@" -o $(dirname "${libstatic}")/"${soname}" || die "${soname} failed"
+ ln -s "${soname}" $(dirname "${libstatic}")/"${soname%.*}"
+}
+
+src_prepare() {
+ sed -e "s:^\(CC\s*=\).*:\1$(tc-getCC):" \
+ -e "s:^\(FC\s*=\).*:\1$(tc-getFC):" \
+ -e "s:^\(FL\s*=\).*:\1$(tc-getFC):" \
+ -e "s:^\(AR\s*=\).*:\1$(tc-getAR) rv :" \
+ -e "s:^\(RANLIB\s*=\).*:\1$(tc-getRANLIB):" \
+ -e "s:^\(LIBBLAS\s*=\).*:\1$(pkg-config --libs blas):" \
+ -e "s:^\(INCPAR\s*=\).*:\1:" \
+ -e 's:^\(LIBPAR\s*=\).*:\1$(SCALAP):' \
+ -e "s:^\(OPTF\s*=\).*:\1${FFLAGS} -DALLOW_NON_INIT \$(PIC):" \
+ -e "s:^\(OPTC\s*=\).*:\1${CFLAGS} \$(PIC):" \
+ -e "s:^\(OPTL\s*=\).*:\1${LDFLAGS}:" \
+ Make.inc/Makefile.inc.generic > Makefile.inc || die
+}
+
+src_configure() {
+ LIBADD="$(pkg-config --libs blas) -Llib -lpord"
+ local ord="-Dpord"
+ if use metis && use mpi; then
+ sed -i \
+ -e "s:#\s*\(LMETIS\s*=\).*:\1$(pkg-config --libs parmetis):" \
+ -e "s:#\s*\(IMETIS\s*=\).*:\1$(pkg-config --cflags parmetis):" \
+ Makefile.inc || die
+ LIBADD="${LIBADD} $(pkg-config --libs parmetis)"
+ ord="${ord} -Dparmetis"
+ elif use metis; then
+ sed -i \
+ -e "s:#\s*\(LMETIS\s*=\).*:\1$(pkg-config --libs metis):" \
+ -e "s:#\s*\(IMETIS\s*=\).*:\1$(pkg-config --cflags metis):" \
+ Makefile.inc || die
+ LIBADD="${LIBADD} $(pkg-config --libs metis)"
+ ord="${ord} -Dmetis"
+ fi
+ if use scotch && use mpi; then
+ sed -i \
+ -e "s:#\s*\(LSCOTCH\s*=\).*:\1-lptesmumps -lptscotch -lptscotcherr:" \
+ -e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \
+ Makefile.inc || die
+ LIBADD="${LIBADD} -lptesmumps -lptscotch -lptscotcherr"
+ ord="${ord} -Dptscotch"
+ elif use scotch; then
+ sed -i \
+ -e "s:#\s*\(LSCOTCH\s*=\).*:\1-lesmumps -lscotch -lscotcherr:" \
+ -e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \
+ Makefile.inc || die
+ LIBADD="${LIBADD} -lesmumps -lscotch -lscotcherr"
+ ord="${ord} -Dscotch"
+ fi
+ if use mpi; then
+ sed -i \
+ -e "s:^\(CC\s*=\).*:\1mpicc:" \
+ -e "s:^\(FC\s*=\).*:\1mpif90:" \
+ -e "s:^\(FL\s*=\).*:\1mpif90:" \
+ -e "s:^\(SCALAP\s*=\).*:\1$(pkg-config --libs scalapack):" \
+ Makefile.inc || die
+ export LINK=mpif90
+ LIBADD="${LIBADD} $(pkg-config --libs scalapack)"
+ fi
+ sed -i -e "s:^\s*\(ORDERINGSF\s*=\).*:\1 ${ord}:" Makefile.inc || die
+}
+
+src_compile() {
+ emake alllib PIC="-fPIC"
+ make_shared_lib lib/libmumps_common.a ${LIBADD}
+ local i
+ for i in c d s z; do
+ make_shared_lib lib/lib${i}mumps.a -Llib -lmumps_common
+ done
+ if use static-libs; then
+ emake clean
+ emake alllib
+ fi
+}
+
+src_test() {
+ emake all
+ local dotest
+ use mpi && dotest="mpirun -np 2"
+ cd examples
+ ${dotest} ./ssimpletest < input_simpletest_real || die
+ ${dotest} ./dsimpletest < input_simpletest_real || die
+ ${dotest} ./csimpletest < input_simpletest_cmplx || die
+ ${dotest} ./zsimpletest < input_simpletest_cmplx || die
+ einfo "The solutions should be close to (1,2,3,4,5)"
+ ${dotest} ./c_example || die
+ einfo "The solution should be close to (1,2)"
+ make clean
+}
+
+src_install() {
+ dolib.so lib/lib*.so*
+ use static-libs && dolib.a lib/lib*.a
+ insinto /usr
+ doins -r include
+ dodoc README ChangeLog VERSION
+ use doc && dodoc doc/*.pdf
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/
@ 2012-03-13 0:56 Sebastien Fabbro
0 siblings, 0 replies; 11+ messages in thread
From: Sebastien Fabbro @ 2012-03-13 0:56 UTC (permalink / raw
To: gentoo-commits
commit: 678034defc1b405ff12c5a1afbdcd97ad28873fb
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Mon Mar 12 17:29:09 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 17:29:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=678034de
sci-libs/mumps: only allow earlier metis versions
---
sci-libs/mumps/ChangeLog | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/sci-libs/mumps/ChangeLog b/sci-libs/mumps/ChangeLog
index 66ba813..d8f6c12 100644
--- a/sci-libs/mumps/ChangeLog
+++ b/sci-libs/mumps/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild:
+ Only allow earlier parmetis versions
+
12 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +mumps-4.10.0.ebuild,
+metadata.xml:
metis-mpi is now parmetis
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/
@ 2012-03-13 0:56 Sebastien Fabbro
0 siblings, 0 replies; 11+ messages in thread
From: Sebastien Fabbro @ 2012-03-13 0:56 UTC (permalink / raw
To: gentoo-commits
commit: efcff6df1ff30ec13bb235b246e517412f3ee159
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Tue Mar 13 00:56:05 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 00:56:05 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=efcff6df
sci-libs/mumps: Fixed for sequential (non mpi) libraries
(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/mumps/ChangeLog | 4 ++++
sci-libs/mumps/metadata.xml | 5 +++++
sci-libs/mumps/mumps-4.10.0.ebuild | 18 ++++++++++++++----
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/sci-libs/mumps/ChangeLog b/sci-libs/mumps/ChangeLog
index d8f6c12..93973ef 100644
--- a/sci-libs/mumps/ChangeLog
+++ b/sci-libs/mumps/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild,
+ metadata.xml:
+ Fixed for sequential (non mpi) libraries
+
12 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild:
Only allow earlier parmetis versions
diff --git a/sci-libs/mumps/metadata.xml b/sci-libs/mumps/metadata.xml
index e9804fe..3c712bd 100644
--- a/sci-libs/mumps/metadata.xml
+++ b/sci-libs/mumps/metadata.xml
@@ -10,4 +10,9 @@
interfaces, and can interface with ordering tools such
as Scotch or Metis.
</longdescription>
+<use>
+ <flag name="metis">Enable ordering with METIS
+ (<pkg>sci-libs/metis</pkg>, <pkg>sci-libs/parmetis</pkg>)</flag>
+ <flag name="scotch">Enable ordering with <pkg>sci-libs/scotch</pkg></flag>
+</use>
</pkgmetadata>
diff --git a/sci-libs/mumps/mumps-4.10.0.ebuild b/sci-libs/mumps/mumps-4.10.0.ebuild
index e1c5015..dc6a62d 100644
--- a/sci-libs/mumps/mumps-4.10.0.ebuild
+++ b/sci-libs/mumps/mumps-4.10.0.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-inherit eutils toolchain-funcs flag-o-matic versionator
+inherit eutils toolchain-funcs flag-o-matic versionator fortran-2
MYP=MUMPS_${PV}
@@ -17,11 +17,13 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc examples metis mpi +scotch static-libs"
RDEPEND="virtual/blas
- sci-libs/parmetis[mpi?]
- scotch? ( sci-libs/scotch[mpi?] )
- mpi? ( virtual/scalapack )"
+ metis? ( || ( sci-libs/metis <sci-libs/parmetis-4 )
+ mpi? ( <sci-libs/parmetis-4 ) )
+ scotch? ( sci-libs/scotch[mpi=] )
+ mpi? ( virtual/scalapack )"
DEPEND="${RDEPEND}
+ virtual/fortran
dev-util/pkgconfig"
S="${WORKDIR}/${MYP}"
@@ -51,6 +53,8 @@ src_prepare() {
-e "s:^\(OPTC\s*=\).*:\1${CFLAGS} \$(PIC):" \
-e "s:^\(OPTL\s*=\).*:\1${LDFLAGS}:" \
Make.inc/Makefile.inc.generic > Makefile.inc || die
+ # fixed a missing copy of libseq to libdir
+
}
src_configure() {
@@ -95,6 +99,12 @@ src_configure() {
Makefile.inc || die
export LINK=mpif90
LIBADD="${LIBADD} $(pkg-config --libs scalapack)"
+ else
+ sed -i \
+ -e 's:-Llibseq:-L$(topdir)/libseq:' \
+ -e 's:PAR):SEQ):g' \
+ -e 's:^LIBSEQNEEDED =:LIBSEQNEEDED = libseqneeded:g' \
+ Makefile.inc || die
fi
sed -i -e "s:^\s*\(ORDERINGSF\s*=\).*:\1 ${ord}:" Makefile.inc || die
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/
@ 2012-07-12 20:43 Sebastien Fabbro
0 siblings, 0 replies; 11+ messages in thread
From: Sebastien Fabbro @ 2012-07-12 20:43 UTC (permalink / raw
To: gentoo-commits
commit: 3bfe9db4f84571c965e6712a05be90a4a6bd9be9
Author: Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Thu Jul 12 15:43:50 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 15:43:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3bfe9db4
sci-libs/mumps: prefix love
(Portage version: 2.2.01.20757-prefix/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/mumps/ChangeLog | 4 +++-
sci-libs/mumps/mumps-4.10.0.ebuild | 32 +++++++++++++++++++++-----------
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/sci-libs/mumps/ChangeLog b/sci-libs/mumps/ChangeLog
index 93973ef..4f22cd1 100644
--- a/sci-libs/mumps/ChangeLog
+++ b/sci-libs/mumps/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild:
+ sci-libs/mumps: prefix love
+
13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild,
metadata.xml:
Fixed for sequential (non mpi) libraries
@@ -18,4 +21,3 @@
01 Jun 2011; Sébastien Fabbro <bicatali@gentoo.org> +mumps-4.10.0.ebuild,
+metadata.xml:
Initial import
-
diff --git a/sci-libs/mumps/mumps-4.10.0.ebuild b/sci-libs/mumps/mumps-4.10.0.ebuild
index dc6a62d..a148f55 100644
--- a/sci-libs/mumps/mumps-4.10.0.ebuild
+++ b/sci-libs/mumps/mumps-4.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${HOMEPAGE}${MYP}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples metis mpi +scotch static-libs"
RDEPEND="virtual/blas
@@ -24,20 +24,30 @@ RDEPEND="virtual/blas
DEPEND="${RDEPEND}
virtual/fortran
- dev-util/pkgconfig"
+ virtual/pkgconfig"
S="${WORKDIR}/${MYP}"
make_shared_lib() {
local libstatic=${1}
- local soname=$(basename "${1%.a}").so.$(get_major_version)
- shift
- einfo "Making ${soname}"
- ${LINK:-$(tc-getCC)} ${LDFLAGS} \
- -shared -Wl,-soname="${soname}" \
- -Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \
- "$@" -o $(dirname "${libstatic}")/"${soname}" || die "${soname} failed"
- ln -s "${soname}" $(dirname "${libstatic}")/"${soname%.*}"
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ local dylibname=$(basename "${1%.a}").dylib
+ shift
+ einfo "Making ${dylibname}"
+ ${LINK:-$(tc-getCC)} ${LDFLAGS} \
+ -dynamiclib -install_name "${EPREFIX}"/usr/lib/"${dylibname}" \
+ -Wl,-all_load -Wl,"${libstatic}" \
+ "$@" -o $(dirname "${libstatic}")/"${dylibname}" || die
+ else
+ local soname=$(basename "${1%.a}").so.${LIBVER}
+ shift
+ einfo "Making ${soname}"
+ ${LINK:-$(tc-getCC)} ${LDFLAGS} \
+ -shared -Wl,-soname="${soname}" \
+ -Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \
+ "$@" -o $(dirname "${libstatic}")/"${soname}" || die "${soname} failed"
+ ln -s "${soname}" $(dirname "${libstatic}")/"${soname%.*}"
+ fi
}
src_prepare() {
@@ -138,7 +148,7 @@ src_test() {
}
src_install() {
- dolib.so lib/lib*.so*
+ dolib.so lib/lib*$(get_libname)*
use static-libs && dolib.a lib/lib*.a
insinto /usr
doins -r include
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/
@ 2012-07-12 20:43 Sebastien Fabbro
0 siblings, 0 replies; 11+ messages in thread
From: Sebastien Fabbro @ 2012-07-12 20:43 UTC (permalink / raw
To: gentoo-commits
commit: 745521660eb5de3161897e71afd923123440e7c4
Author: Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Thu Jul 12 18:48:00 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 18:48:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=74552166
sci-libs/mumps: Shared library fixes and prefix love
(Portage version: 2.2.01.20757-prefix/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
---
sci-libs/mumps/ChangeLog | 3 ++
sci-libs/mumps/mumps-4.10.0.ebuild | 39 ++++++++++++++++++-----------------
2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/sci-libs/mumps/ChangeLog b/sci-libs/mumps/ChangeLog
index 4f22cd1..7c1bd5b 100644
--- a/sci-libs/mumps/ChangeLog
+++ b/sci-libs/mumps/ChangeLog
@@ -3,6 +3,9 @@
# $Header: $
12 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild:
+ sci-libs/mumps: Shared library fixes and prefix love
+
+ 12 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild:
sci-libs/mumps: prefix love
13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild,
diff --git a/sci-libs/mumps/mumps-4.10.0.ebuild b/sci-libs/mumps/mumps-4.10.0.ebuild
index a148f55..c5ba564 100644
--- a/sci-libs/mumps/mumps-4.10.0.ebuild
+++ b/sci-libs/mumps/mumps-4.10.0.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-inherit eutils toolchain-funcs flag-o-matic versionator fortran-2
+inherit eutils toolchain-funcs flag-o-matic versionator fortran-2 multilib
MYP=MUMPS_${PV}
@@ -17,36 +17,37 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples metis mpi +scotch static-libs"
RDEPEND="virtual/blas
+ virtual/fortran
metis? ( || ( sci-libs/metis <sci-libs/parmetis-4 )
mpi? ( <sci-libs/parmetis-4 ) )
scotch? ( sci-libs/scotch[mpi=] )
mpi? ( virtual/scalapack )"
DEPEND="${RDEPEND}
- virtual/fortran
virtual/pkgconfig"
S="${WORKDIR}/${MYP}"
-make_shared_lib() {
- local libstatic=${1}
+static_to_shared() {
+ local libstatic=${1}; shift
+ local libname=$(basename ${libstatic%.a})
+ local soname=${libname}$(get_libname $(get_version_component_range 1-2))
+ local libdir=$(dirname ${libstatic})
+
+ einfo "Making ${soname} from ${libstatic}"
if [[ ${CHOST} == *-darwin* ]] ; then
- local dylibname=$(basename "${1%.a}").dylib
- shift
- einfo "Making ${dylibname}"
${LINK:-$(tc-getCC)} ${LDFLAGS} \
- -dynamiclib -install_name "${EPREFIX}"/usr/lib/"${dylibname}" \
- -Wl,-all_load -Wl,"${libstatic}" \
- "$@" -o $(dirname "${libstatic}")/"${dylibname}" || die
+ -dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+ -Wl,-all_load -Wl,${libstatic} \
+ "$@" -o ${libdir}/${soname} || die "${soname} failed"
else
- local soname=$(basename "${1%.a}").so.${LIBVER}
- shift
- einfo "Making ${soname}"
${LINK:-$(tc-getCC)} ${LDFLAGS} \
- -shared -Wl,-soname="${soname}" \
- -Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \
- "$@" -o $(dirname "${libstatic}")/"${soname}" || die "${soname} failed"
- ln -s "${soname}" $(dirname "${libstatic}")/"${soname%.*}"
+ -shared -Wl,-soname=${soname} \
+ -Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+ "$@" -o ${libdir}/${soname} || die "${soname} failed"
+ [[ $(get_version_component_count) -gt 1 ]] && \
+ ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
+ ln -s ${soname} ${libdir}/${libname}$(get_libname)
fi
}
@@ -121,10 +122,10 @@ src_configure() {
src_compile() {
emake alllib PIC="-fPIC"
- make_shared_lib lib/libmumps_common.a ${LIBADD}
+ static_to_shared lib/libmumps_common.a ${LIBADD}
local i
for i in c d s z; do
- make_shared_lib lib/lib${i}mumps.a -Llib -lmumps_common
+ static_to_shared lib/lib${i}mumps.a -Llib -lmumps_common
done
if use static-libs; then
emake clean
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/
@ 2012-07-13 4:45 Sebastien Fabbro
0 siblings, 0 replies; 11+ messages in thread
From: Sebastien Fabbro @ 2012-07-13 4:45 UTC (permalink / raw
To: gentoo-commits
commit: c0c835cdafcd0fac065441eface9ecb62e478841
Author: Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Fri Jul 13 04:45:22 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 04:45:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c0c835cd
sci-libs/mumps: fix underlinking for sequential library
(Portage version: 2.2.01.20757-prefix/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/mumps/ChangeLog | 3 +++
sci-libs/mumps/mumps-4.10.0.ebuild | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/sci-libs/mumps/ChangeLog b/sci-libs/mumps/ChangeLog
index 7c1bd5b..63d6469 100644
--- a/sci-libs/mumps/ChangeLog
+++ b/sci-libs/mumps/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 13 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild:
+ sci-libs/mumps: fix underlinking for sequential library
+
12 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild:
sci-libs/mumps: Shared library fixes and prefix love
diff --git a/sci-libs/mumps/mumps-4.10.0.ebuild b/sci-libs/mumps/mumps-4.10.0.ebuild
index c5ba564..63d72fd 100644
--- a/sci-libs/mumps/mumps-4.10.0.ebuild
+++ b/sci-libs/mumps/mumps-4.10.0.ebuild
@@ -65,7 +65,6 @@ src_prepare() {
-e "s:^\(OPTL\s*=\).*:\1${LDFLAGS}:" \
Make.inc/Makefile.inc.generic > Makefile.inc || die
# fixed a missing copy of libseq to libdir
-
}
src_configure() {
@@ -114,8 +113,11 @@ src_configure() {
sed -i \
-e 's:-Llibseq:-L$(topdir)/libseq:' \
-e 's:PAR):SEQ):g' \
+ -e "s:^\(SCALAP\s*=\).*:\1:" \
-e 's:^LIBSEQNEEDED =:LIBSEQNEEDED = libseqneeded:g' \
Makefile.inc || die
+ LIBADD="${LIBADD} -Llibseq -lmpiseq"
+ export LINK="$(tc-getFC)"
fi
sed -i -e "s:^\s*\(ORDERINGSF\s*=\).*:\1 ${ord}:" Makefile.inc || die
}
@@ -125,7 +127,7 @@ src_compile() {
static_to_shared lib/libmumps_common.a ${LIBADD}
local i
for i in c d s z; do
- static_to_shared lib/lib${i}mumps.a -Llib -lmumps_common
+ static_to_shared lib/lib${i}mumps.a -Llib -lmumps_common ${LIBADD}
done
if use static-libs; then
emake clean
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/
@ 2012-07-15 20:19 Sebastien Fabbro
0 siblings, 0 replies; 11+ messages in thread
From: Sebastien Fabbro @ 2012-07-15 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 1666778ddfbeb170b3e09cc0af0f5d14986d2e3a
Author: Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Sun Jul 15 20:19:05 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 20:19:05 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1666778d
sci-libs/mumps: Merge dummy sequential mpi into sequential mumps
(Portage version: 2.2.01.20757-prefix/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/mumps/ChangeLog | 3 +++
sci-libs/mumps/mumps-4.10.0-r1.ebuild | 11 +++++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/sci-libs/mumps/ChangeLog b/sci-libs/mumps/ChangeLog
index 63d6469..d482c46 100644
--- a/sci-libs/mumps/ChangeLog
+++ b/sci-libs/mumps/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 15 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0-r1.ebuild:
+ sci-libs/mumps: Merge dummy sequential mpi into sequential mumps
+
13 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild:
sci-libs/mumps: fix underlinking for sequential library
diff --git a/sci-libs/mumps/mumps-4.10.0-r1.ebuild b/sci-libs/mumps/mumps-4.10.0-r1.ebuild
index 63d72fd..8c384b1 100644
--- a/sci-libs/mumps/mumps-4.10.0-r1.ebuild
+++ b/sci-libs/mumps/mumps-4.10.0-r1.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
sed -e "s:^\(CC\s*=\).*:\1$(tc-getCC):" \
-e "s:^\(FC\s*=\).*:\1$(tc-getFC):" \
-e "s:^\(FL\s*=\).*:\1$(tc-getFC):" \
- -e "s:^\(AR\s*=\).*:\1$(tc-getAR) rv :" \
+ -e "s:^\(AR\s*=\).*:\1$(tc-getAR) cr :" \
-e "s:^\(RANLIB\s*=\).*:\1$(tc-getRANLIB):" \
-e "s:^\(LIBBLAS\s*=\).*:\1$(pkg-config --libs blas):" \
-e "s:^\(INCPAR\s*=\).*:\1:" \
@@ -116,7 +116,6 @@ src_configure() {
-e "s:^\(SCALAP\s*=\).*:\1:" \
-e 's:^LIBSEQNEEDED =:LIBSEQNEEDED = libseqneeded:g' \
Makefile.inc || die
- LIBADD="${LIBADD} -Llibseq -lmpiseq"
export LINK="$(tc-getFC)"
fi
sed -i -e "s:^\s*\(ORDERINGSF\s*=\).*:\1 ${ord}:" Makefile.inc || die
@@ -124,7 +123,11 @@ src_configure() {
src_compile() {
emake alllib PIC="-fPIC"
+ if ! use mpi; then
+ $(tc-getAR) crs lib/libmumps_common.a libseq/*.o || die
+ fi
static_to_shared lib/libmumps_common.a ${LIBADD}
+
local i
for i in c d s z; do
static_to_shared lib/lib${i}mumps.a -Llib -lmumps_common ${LIBADD}
@@ -155,6 +158,10 @@ src_install() {
use static-libs && dolib.a lib/lib*.a
insinto /usr
doins -r include
+ if ! use mpi; then
+ insinto /usr/include/mpiseq
+ doins libseq/*.h
+ fi
dodoc README ChangeLog VERSION
use doc && dodoc doc/*.pdf
if use examples; then
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/
@ 2012-07-15 20:19 Sebastien Fabbro
0 siblings, 0 replies; 11+ messages in thread
From: Sebastien Fabbro @ 2012-07-15 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 8b23907603da8a807e48c711dc954545d5276c36
Author: Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Sun Jul 15 20:18:15 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 20:18:15 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8b239076
Merge branch 'master' of git://git.overlays.gentoo.org/proj/sci; github.com:gentoo-science/sci
---
...{mumps-4.10.0.ebuild => mumps-4.10.0-r1.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/sci-libs/mumps/mumps-4.10.0.ebuild b/sci-libs/mumps/mumps-4.10.0-r1.ebuild
similarity index 100%
rename from sci-libs/mumps/mumps-4.10.0.ebuild
rename to sci-libs/mumps/mumps-4.10.0-r1.ebuild
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/
@ 2012-12-11 20:11 Sebastien Fabbro
0 siblings, 0 replies; 11+ messages in thread
From: Sebastien Fabbro @ 2012-12-11 20:11 UTC (permalink / raw
To: gentoo-commits
commit: 0fc4b2e2d2f09edbb7c21a28f89976d789457709
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 20:11:02 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 20:11:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0fc4b2e2
sci-libs/mumps: Install libpord, force -j1 on makefile because of random parallel build failures, separate dummy sequential mpi library from the common mumps library
Package-Manager: portage-2.2.01.21418-prefix
---
sci-libs/mumps/ChangeLog | 8 ++++
sci-libs/mumps/metadata.xml | 4 +-
...mps-4.10.0-r1.ebuild => mumps-4.10.0-r2.ebuild} | 42 ++++++++++++-------
3 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/sci-libs/mumps/ChangeLog b/sci-libs/mumps/ChangeLog
index d482c46..6eba453 100644
--- a/sci-libs/mumps/ChangeLog
+++ b/sci-libs/mumps/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mumps-4.10.0-r2 (11 Dec 2012)
+
+ 11 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +mumps-4.10.0-r2.ebuild,
+ -mumps-4.10.0-r1.ebuild, metadata.xml:
+ sci-libs/mumps: Install libpord, force -j1 on makefile because of random
+ parallel build failures, separate dummy sequential mpi library from the common
+ mumps library
+
15 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0-r1.ebuild:
sci-libs/mumps: Merge dummy sequential mpi into sequential mumps
diff --git a/sci-libs/mumps/metadata.xml b/sci-libs/mumps/metadata.xml
index 3c712bd..3aa8aad 100644
--- a/sci-libs/mumps/metadata.xml
+++ b/sci-libs/mumps/metadata.xml
@@ -11,8 +11,8 @@
as Scotch or Metis.
</longdescription>
<use>
- <flag name="metis">Enable ordering with METIS
+ <flag name="metis">Enable matrix ordering with METIS
(<pkg>sci-libs/metis</pkg>, <pkg>sci-libs/parmetis</pkg>)</flag>
- <flag name="scotch">Enable ordering with <pkg>sci-libs/scotch</pkg></flag>
+ <flag name="scotch">Enable matrix ordering with <pkg>sci-libs/scotch</pkg></flag>
</use>
</pkgmetadata>
diff --git a/sci-libs/mumps/mumps-4.10.0-r1.ebuild b/sci-libs/mumps/mumps-4.10.0-r2.ebuild
similarity index 79%
rename from sci-libs/mumps/mumps-4.10.0-r1.ebuild
rename to sci-libs/mumps/mumps-4.10.0-r2.ebuild
index 8c384b1..0d63d75 100644
--- a/sci-libs/mumps/mumps-4.10.0-r1.ebuild
+++ b/sci-libs/mumps/mumps-4.10.0-r2.ebuild
@@ -16,8 +16,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples metis mpi +scotch static-libs"
-RDEPEND="virtual/blas
- virtual/fortran
+RDEPEND="
+ virtual/blas
metis? ( || ( sci-libs/metis <sci-libs/parmetis-4 )
mpi? ( <sci-libs/parmetis-4 ) )
scotch? ( sci-libs/scotch[mpi=] )
@@ -57,7 +57,7 @@ src_prepare() {
-e "s:^\(FL\s*=\).*:\1$(tc-getFC):" \
-e "s:^\(AR\s*=\).*:\1$(tc-getAR) cr :" \
-e "s:^\(RANLIB\s*=\).*:\1$(tc-getRANLIB):" \
- -e "s:^\(LIBBLAS\s*=\).*:\1$(pkg-config --libs blas):" \
+ -e "s:^\(LIBBLAS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs blas):" \
-e "s:^\(INCPAR\s*=\).*:\1:" \
-e 's:^\(LIBPAR\s*=\).*:\1$(SCALAP):' \
-e "s:^\(OPTF\s*=\).*:\1${FFLAGS} -DALLOW_NON_INIT \$(PIC):" \
@@ -68,21 +68,21 @@ src_prepare() {
}
src_configure() {
- LIBADD="$(pkg-config --libs blas) -Llib -lpord"
+ LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord"
local ord="-Dpord"
if use metis && use mpi; then
sed -i \
- -e "s:#\s*\(LMETIS\s*=\).*:\1$(pkg-config --libs parmetis):" \
- -e "s:#\s*\(IMETIS\s*=\).*:\1$(pkg-config --cflags parmetis):" \
+ -e "s:#\s*\(LMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs parmetis):" \
+ -e "s:#\s*\(IMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --cflags parmetis):" \
Makefile.inc || die
- LIBADD="${LIBADD} $(pkg-config --libs parmetis)"
+ LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs parmetis)"
ord="${ord} -Dparmetis"
elif use metis; then
sed -i \
- -e "s:#\s*\(LMETIS\s*=\).*:\1$(pkg-config --libs metis):" \
- -e "s:#\s*\(IMETIS\s*=\).*:\1$(pkg-config --cflags metis):" \
+ -e "s:#\s*\(LMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs metis):" \
+ -e "s:#\s*\(IMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --cflags metis):" \
Makefile.inc || die
- LIBADD="${LIBADD} $(pkg-config --libs metis)"
+ LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs metis)"
ord="${ord} -Dmetis"
fi
if use scotch && use mpi; then
@@ -105,10 +105,10 @@ src_configure() {
-e "s:^\(CC\s*=\).*:\1mpicc:" \
-e "s:^\(FC\s*=\).*:\1mpif90:" \
-e "s:^\(FL\s*=\).*:\1mpif90:" \
- -e "s:^\(SCALAP\s*=\).*:\1$(pkg-config --libs scalapack):" \
+ -e "s:^\(SCALAP\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs scalapack):" \
Makefile.inc || die
export LINK=mpif90
- LIBADD="${LIBADD} $(pkg-config --libs scalapack)"
+ LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs scalapack)"
else
sed -i \
-e 's:-Llibseq:-L$(topdir)/libseq:' \
@@ -122,10 +122,14 @@ src_configure() {
}
src_compile() {
- emake alllib PIC="-fPIC"
+ # -j1 because of static archive race
+ emake -j1 alllib PIC="-fPIC"
if ! use mpi; then
- $(tc-getAR) crs lib/libmumps_common.a libseq/*.o || die
+ #$(tc-getAR) crs lib/libmumps_common.a libseq/*.o || die
+ LIBADD+=" -Llibseq -lmpiseq"
+ static_to_shared libseq/libmpiseq.a
fi
+ static_to_shared lib/libpord.a ${LIBADD}
static_to_shared lib/libmumps_common.a ${LIBADD}
local i
@@ -134,14 +138,18 @@ src_compile() {
done
if use static-libs; then
emake clean
- emake alllib
+ emake -j1 alllib
fi
}
src_test() {
emake all
local dotest
- use mpi && dotest="mpirun -np 2"
+ if use mpi; then
+ dotest="mpirun -np 2"
+ else
+ export LD_LIBRARY_PATH="${S}/libseq:${LD_LIBRARY_PATH}"
+ fi
cd examples
${dotest} ./ssimpletest < input_simpletest_real || die
${dotest} ./dsimpletest < input_simpletest_real || die
@@ -159,8 +167,10 @@ src_install() {
insinto /usr
doins -r include
if ! use mpi; then
+ dolib.so libseq/lib*$(get_libname)*
insinto /usr/include/mpiseq
doins libseq/*.h
+ use static-libs && dolib.a libseq/libmpiseq.a
fi
dodoc README ChangeLog VERSION
use doc && dodoc doc/*.pdf
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/
@ 2013-06-18 9:07 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2013-06-18 9:07 UTC (permalink / raw
To: gentoo-commits
commit: 271427dc20189d9ab3e796f0953ad1a1f4ce6850
Author: Justin Bronder <jbronder <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 23:20:17 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 23:20:17 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=271427dc
Don't let openmpi override malloc, works around sandbox issue in #462602
Package-Manager: portage-2.1.11.62
---
sci-libs/mumps/ChangeLog | 5 ++++-
sci-libs/mumps/mumps-4.10.0-r2.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/sci-libs/mumps/ChangeLog b/sci-libs/mumps/ChangeLog
index 6eba453..46b5d6d 100644
--- a/sci-libs/mumps/ChangeLog
+++ b/sci-libs/mumps/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sci-libs/mumps
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 17 Jun 2013; Justin Bronder <jsbronder@gentoo.org> mumps-4.10.0-r2.ebuild:
+ Don't let openmpi override malloc, works around sandbox issue in #462602
+
*mumps-4.10.0-r2 (11 Dec 2012)
11 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +mumps-4.10.0-r2.ebuild,
diff --git a/sci-libs/mumps/mumps-4.10.0-r2.ebuild b/sci-libs/mumps/mumps-4.10.0-r2.ebuild
index 0d63d75..0aa195e 100644
--- a/sci-libs/mumps/mumps-4.10.0-r2.ebuild
+++ b/sci-libs/mumps/mumps-4.10.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -122,6 +122,9 @@ src_configure() {
}
src_compile() {
+ # Workaround #462602
+ export FAKEROOTKEY=1
+
# -j1 because of static archive race
emake -j1 alllib PIC="-fPIC"
if ! use mpi; then
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/
@ 2014-05-12 19:25 Sebastien Fabbro
0 siblings, 0 replies; 11+ messages in thread
From: Sebastien Fabbro @ 2014-05-12 19:25 UTC (permalink / raw
To: gentoo-commits
commit: c53b06a989ec9c366652c58a9b63bb7a125b1395
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon May 12 19:25:39 2014 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon May 12 19:25:39 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c53b06a9
mumps now in main tree
---
sci-libs/mumps/ChangeLog | 43 --------
sci-libs/mumps/metadata.xml | 18 ----
sci-libs/mumps/mumps-4.10.0-r2.ebuild | 184 ----------------------------------
3 files changed, 245 deletions(-)
diff --git a/sci-libs/mumps/ChangeLog b/sci-libs/mumps/ChangeLog
deleted file mode 100644
index 46b5d6d..0000000
--- a/sci-libs/mumps/ChangeLog
+++ /dev/null
@@ -1,43 +0,0 @@
-# ChangeLog for sci-libs/mumps
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 17 Jun 2013; Justin Bronder <jsbronder@gentoo.org> mumps-4.10.0-r2.ebuild:
- Don't let openmpi override malloc, works around sandbox issue in #462602
-
-*mumps-4.10.0-r2 (11 Dec 2012)
-
- 11 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +mumps-4.10.0-r2.ebuild,
- -mumps-4.10.0-r1.ebuild, metadata.xml:
- sci-libs/mumps: Install libpord, force -j1 on makefile because of random
- parallel build failures, separate dummy sequential mpi library from the common
- mumps library
-
- 15 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0-r1.ebuild:
- sci-libs/mumps: Merge dummy sequential mpi into sequential mumps
-
- 13 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild:
- sci-libs/mumps: fix underlinking for sequential library
-
- 12 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild:
- sci-libs/mumps: Shared library fixes and prefix love
-
- 12 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild:
- sci-libs/mumps: prefix love
-
- 13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild,
- metadata.xml:
- Fixed for sequential (non mpi) libraries
-
- 12 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild:
- Only allow earlier parmetis versions
-
- 12 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +mumps-4.10.0.ebuild,
- +metadata.xml:
- metis-mpi is now parmetis
-
-*mumps-4.10.0 (01 Jun 2011)
-
- 01 Jun 2011; Sébastien Fabbro <bicatali@gentoo.org> +mumps-4.10.0.ebuild,
- +metadata.xml:
- Initial import
diff --git a/sci-libs/mumps/metadata.xml b/sci-libs/mumps/metadata.xml
deleted file mode 100644
index 3aa8aad..0000000
--- a/sci-libs/mumps/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang='en'>
- MUltifrontal Massively Parallel sparse direct Solver implements a
- direct solver for large sparse linear systems, with a particular
- focus on symmetric positive definite matrices. It can operate on
- distributed matrices e.g. over a cluster. It has Fortran and C
- interfaces, and can interface with ordering tools such
- as Scotch or Metis.
-</longdescription>
-<use>
- <flag name="metis">Enable matrix ordering with METIS
- (<pkg>sci-libs/metis</pkg>, <pkg>sci-libs/parmetis</pkg>)</flag>
- <flag name="scotch">Enable matrix ordering with <pkg>sci-libs/scotch</pkg></flag>
-</use>
-</pkgmetadata>
diff --git a/sci-libs/mumps/mumps-4.10.0-r2.ebuild b/sci-libs/mumps/mumps-4.10.0-r2.ebuild
deleted file mode 100644
index dc27d83..0000000
--- a/sci-libs/mumps/mumps-4.10.0-r2.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils toolchain-funcs flag-o-matic versionator fortran-2 multilib
-
-MYP=MUMPS_${PV}
-
-DESCRIPTION="MUltifrontal Massively Parallel sparse direct matrix Solver"
-HOMEPAGE="http://mumps.enseeiht.fr/"
-SRC_URI="${HOMEPAGE}${MYP}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples metis mpi +scotch static-libs"
-
-RDEPEND="
- virtual/blas
- metis? ( || ( sci-libs/metis <sci-libs/parmetis-4 )
- mpi? ( <sci-libs/parmetis-4 ) )
- scotch? ( sci-libs/scotch[mpi=] )
- mpi? ( virtual/scalapack )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-static_to_shared() {
- local libstatic=${1}; shift
- local libname=$(basename ${libstatic%.a})
- local soname=${libname}$(get_libname $(get_version_component_range 1-2))
- local libdir=$(dirname ${libstatic})
-
- einfo "Making ${soname} from ${libstatic}"
- if [[ ${CHOST} == *-darwin* ]] ; then
- ${LINK:-$(tc-getCC)} ${LDFLAGS} \
- -dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
- -Wl,-all_load -Wl,${libstatic} \
- "$@" -o ${libdir}/${soname} || die "${soname} failed"
- else
- ${LINK:-$(tc-getCC)} ${LDFLAGS} \
- -shared -Wl,-soname=${soname} \
- -Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
- "$@" -o ${libdir}/${soname} || die "${soname} failed"
- [[ $(get_version_component_count) -gt 1 ]] && \
- ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
- ln -s ${soname} ${libdir}/${libname}$(get_libname)
- fi
-}
-
-src_prepare() {
- sed -e "s:^\(CC\s*=\).*:\1$(tc-getCC):" \
- -e "s:^\(FC\s*=\).*:\1$(tc-getFC):" \
- -e "s:^\(FL\s*=\).*:\1$(tc-getFC):" \
- -e "s:^\(AR\s*=\).*:\1$(tc-getAR) cr :" \
- -e "s:^\(RANLIB\s*=\).*:\1$(tc-getRANLIB):" \
- -e "s:^\(LIBBLAS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs blas):" \
- -e "s:^\(INCPAR\s*=\).*:\1:" \
- -e 's:^\(LIBPAR\s*=\).*:\1$(SCALAP):' \
- -e "s:^\(OPTF\s*=\).*:\1${FFLAGS} -DALLOW_NON_INIT \$(PIC):" \
- -e "s:^\(OPTC\s*=\).*:\1${CFLAGS} \$(PIC):" \
- -e "s:^\(OPTL\s*=\).*:\1${LDFLAGS}:" \
- Make.inc/Makefile.inc.generic > Makefile.inc || die
- # fixed a missing copy of libseq to libdir
-}
-
-src_configure() {
- LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord"
- local ord="-Dpord"
- if use metis && use mpi; then
- sed -i \
- -e "s:#\s*\(LMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs parmetis):" \
- -e "s:#\s*\(IMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --cflags parmetis):" \
- Makefile.inc || die
- LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs parmetis)"
- ord="${ord} -Dparmetis"
- elif use metis; then
- sed -i \
- -e "s:#\s*\(LMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs metis):" \
- -e "s:#\s*\(IMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --cflags metis):" \
- Makefile.inc || die
- LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs metis)"
- ord="${ord} -Dmetis"
- fi
- if use scotch && use mpi; then
- sed -i \
- -e "s:#\s*\(LSCOTCH\s*=\).*:\1-lptesmumps -lptscotch -lptscotcherr:" \
- -e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \
- Makefile.inc || die
- LIBADD="${LIBADD} -lptesmumps -lptscotch -lptscotcherr"
- ord="${ord} -Dptscotch"
- elif use scotch; then
- sed -i \
- -e "s:#\s*\(LSCOTCH\s*=\).*:\1-lesmumps -lscotch -lscotcherr:" \
- -e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \
- Makefile.inc || die
- LIBADD="${LIBADD} -lesmumps -lscotch -lscotcherr"
- ord="${ord} -Dscotch"
- fi
- if use mpi; then
- sed -i \
- -e "s:^\(CC\s*=\).*:\1mpicc:" \
- -e "s:^\(FC\s*=\).*:\1mpif90:" \
- -e "s:^\(FL\s*=\).*:\1mpif90:" \
- -e "s:^\(SCALAP\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs scalapack):" \
- Makefile.inc || die
- export LINK=mpif90
- LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs scalapack)"
- else
- sed -i \
- -e 's:-Llibseq:-L$(topdir)/libseq:' \
- -e 's:PAR):SEQ):g' \
- -e "s:^\(SCALAP\s*=\).*:\1:" \
- -e 's:^LIBSEQNEEDED =:LIBSEQNEEDED = libseqneeded:g' \
- Makefile.inc || die
- export LINK="$(tc-getFC)"
- fi
- sed -i -e "s:^\s*\(ORDERINGSF\s*=\).*:\1 ${ord}:" Makefile.inc || die
-}
-
-src_compile() {
- # Workaround #462602
- export FAKEROOTKEY=1
-
- # -j1 because of static archive race
- emake -j1 alllib PIC="-fPIC"
- if ! use mpi; then
- #$(tc-getAR) crs lib/libmumps_common.a libseq/*.o || die
- LIBADD+=" -Llibseq -lmpiseq"
- static_to_shared libseq/libmpiseq.a
- fi
- static_to_shared lib/libpord.a ${LIBADD}
- static_to_shared lib/libmumps_common.a ${LIBADD}
-
- local i
- for i in c d s z; do
- static_to_shared lib/lib${i}mumps.a -Llib -lmumps_common ${LIBADD}
- done
- if use static-libs; then
- emake clean
- emake -j1 alllib
- fi
-}
-
-src_test() {
- emake all
- local dotest
- if use mpi; then
- dotest="mpirun -np 2"
- else
- export LD_LIBRARY_PATH="${S}/libseq:${LD_LIBRARY_PATH}"
- fi
- cd examples
- ${dotest} ./ssimpletest < input_simpletest_real || die
- ${dotest} ./dsimpletest < input_simpletest_real || die
- ${dotest} ./csimpletest < input_simpletest_cmplx || die
- ${dotest} ./zsimpletest < input_simpletest_cmplx || die
- einfo "The solutions should be close to (1,2,3,4,5)"
- ${dotest} ./c_example || die
- einfo "The solution should be close to (1,2)"
- make clean
-}
-
-src_install() {
- dolib.so lib/lib*$(get_libname)*
- use static-libs && dolib.a lib/lib*.a
- insinto /usr
- doins -r include
- if ! use mpi; then
- dolib.so libseq/lib*$(get_libname)*
- insinto /usr/include/mpiseq
- doins libseq/*.h
- use static-libs && dolib.a libseq/libmpiseq.a
- fi
- dodoc README ChangeLog VERSION
- use doc && dodoc doc/*.pdf
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-05-12 19:26 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-12 19:25 [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/ Sebastien Fabbro
-- strict thread matches above, loose matches on Subject: below --
2013-06-18 9:07 Justin Lecher
2012-12-11 20:11 Sebastien Fabbro
2012-07-15 20:19 Sebastien Fabbro
2012-07-15 20:19 Sebastien Fabbro
2012-07-13 4:45 Sebastien Fabbro
2012-07-12 20:43 Sebastien Fabbro
2012-07-12 20:43 Sebastien Fabbro
2012-03-13 0:56 Sebastien Fabbro
2012-03-13 0:56 Sebastien Fabbro
2012-03-12 16:35 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox