| 1 |
commit: c6902b80403a506ebe337818c849f7d468294927 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 7 17:53:50 2021 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 7 17:54:41 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6902b80 |
| 7 |
|
| 8 |
sci-libs/mumps: new revision to fix more underlinking. |
| 9 |
|
| 10 |
When building without USE=mpi, the various lib*mumps libraries use |
| 11 |
LAPACK symbols without actually linking to liblapack. There are |
| 12 |
already a bunch of hacks in the mumps ebuild to work around these |
| 13 |
issues, so all I've done is add one more. As a simple test case, |
| 14 |
you can try to run the test suite for sci-libs/coinor-clp with |
| 15 |
USE="mumps metis", which now works. |
| 16 |
|
| 17 |
Closes: https://bugs.gentoo.org/777840 |
| 18 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 19 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
| 20 |
|
| 21 |
sci-libs/mumps/{mumps-5.3.5.ebuild => mumps-5.3.5-r1.ebuild} | 4 ++++ |
| 22 |
1 file changed, 4 insertions(+) |
| 23 |
|
| 24 |
diff --git a/sci-libs/mumps/mumps-5.3.5.ebuild b/sci-libs/mumps/mumps-5.3.5-r1.ebuild |
| 25 |
similarity index 97% |
| 26 |
rename from sci-libs/mumps/mumps-5.3.5.ebuild |
| 27 |
rename to sci-libs/mumps/mumps-5.3.5-r1.ebuild |
| 28 |
index 76f2dbe8d4d..8f970661e82 100644 |
| 29 |
--- a/sci-libs/mumps/mumps-5.3.5.ebuild |
| 30 |
+++ b/sci-libs/mumps/mumps-5.3.5-r1.ebuild |
| 31 |
@@ -25,6 +25,7 @@ RDEPEND=" |
| 32 |
mpi? ( >=sci-libs/parmetis-4 ) |
| 33 |
) |
| 34 |
mpi? ( sci-libs/scalapack ) |
| 35 |
+ !mpi? ( virtual/lapack ) |
| 36 |
scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] ) |
| 37 |
" |
| 38 |
DEPEND="${RDEPEND}" |
| 39 |
@@ -83,6 +84,8 @@ src_prepare() { |
| 40 |
} |
| 41 |
|
| 42 |
src_configure() { |
| 43 |
+ # We abuse LIBADD here to work around the fact that MUMPS is criminally |
| 44 |
+ # underlinked. |
| 45 |
LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord" |
| 46 |
local ord="-Dpord" |
| 47 |
|
| 48 |
@@ -132,6 +135,7 @@ src_configure() { |
| 49 |
-e "s;^\(SCALAP\s*=\).*;\1;" \ |
| 50 |
-e 's;^LIBSEQNEEDED =;LIBSEQNEEDED = libseqneeded;g' \ |
| 51 |
Makefile.inc || die |
| 52 |
+ LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs lapack)" |
| 53 |
export LINK="$(tc-getFC)" |
| 54 |
fi |
| 55 |
sed -i -e "s;^\s*\(ORDERINGSF\s*=\).*;\1 ${ord};" Makefile.inc || die |
Archives