aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <sfabbro@uvic.ca>2012-07-12 21:45:22 -0700
committerSebastien Fabbro <sfabbro@uvic.ca>2012-07-12 21:45:22 -0700
commitc0c835cdafcd0fac065441eface9ecb62e478841 (patch)
tree4a45d1f5ceb6f16aa125766d889052562545f057
parentsci-libs/magma: Shared library fixes, prefix love and ebuild cleanup (diff)
downloadsci-c0c835cdafcd0fac065441eface9ecb62e478841.tar.gz
sci-c0c835cdafcd0fac065441eface9ecb62e478841.tar.bz2
sci-c0c835cdafcd0fac065441eface9ecb62e478841.zip
sci-libs/mumps: fix underlinking for sequential library
(Portage version: 2.2.01.20757-prefix/git/Linux x86_64, unsigned Manifest commit)
-rw-r--r--sci-libs/mumps/ChangeLog3
-rw-r--r--sci-libs/mumps/mumps-4.10.0.ebuild6
2 files changed, 7 insertions, 2 deletions
diff --git a/sci-libs/mumps/ChangeLog b/sci-libs/mumps/ChangeLog
index 7c1bd5bac..63d6469c5 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 c5ba56477..63d72fd1b 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