From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A080C158041 for ; Tue, 7 Sep 2021 17:56:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2E97E0874; Tue, 7 Sep 2021 17:56:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D626EE0874 for ; Tue, 7 Sep 2021 17:56:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F3C7342F26 for ; Tue, 7 Sep 2021 17:56:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F7F535 for ; Tue, 7 Sep 2021 17:56:42 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1631037281.c6902b80403a506ebe337818c849f7d468294927.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/mumps/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/mumps/mumps-5.3.5-r1.ebuild sci-libs/mumps/mumps-5.3.5.ebuild X-VCS-Directories: sci-libs/mumps/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: c6902b80403a506ebe337818c849f7d468294927 X-VCS-Branch: master Date: Tue, 7 Sep 2021 17:56:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6fb86438-5054-42b2-a938-bb9e9fe1370e X-Archives-Hash: 78fc454f69e9882f2e9c2b80a6c05336 commit: c6902b80403a506ebe337818c849f7d468294927 Author: Michael Orlitzky gentoo org> AuthorDate: Tue Sep 7 17:53:50 2021 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Tue Sep 7 17:54:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6902b80 sci-libs/mumps: new revision to fix more underlinking. When building without USE=mpi, the various lib*mumps libraries use LAPACK symbols without actually linking to liblapack. There are already a bunch of hacks in the mumps ebuild to work around these issues, so all I've done is add one more. As a simple test case, you can try to run the test suite for sci-libs/coinor-clp with USE="mumps metis", which now works. Closes: https://bugs.gentoo.org/777840 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Michael Orlitzky gentoo.org> sci-libs/mumps/{mumps-5.3.5.ebuild => mumps-5.3.5-r1.ebuild} | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sci-libs/mumps/mumps-5.3.5.ebuild b/sci-libs/mumps/mumps-5.3.5-r1.ebuild similarity index 97% rename from sci-libs/mumps/mumps-5.3.5.ebuild rename to sci-libs/mumps/mumps-5.3.5-r1.ebuild index 76f2dbe8d4d..8f970661e82 100644 --- a/sci-libs/mumps/mumps-5.3.5.ebuild +++ b/sci-libs/mumps/mumps-5.3.5-r1.ebuild @@ -25,6 +25,7 @@ RDEPEND=" mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( sci-libs/scalapack ) + !mpi? ( virtual/lapack ) scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] ) " DEPEND="${RDEPEND}" @@ -83,6 +84,8 @@ src_prepare() { } src_configure() { + # We abuse LIBADD here to work around the fact that MUMPS is criminally + # underlinked. LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord" local ord="-Dpord" @@ -132,6 +135,7 @@ src_configure() { -e "s;^\(SCALAP\s*=\).*;\1;" \ -e 's;^LIBSEQNEEDED =;LIBSEQNEEDED = libseqneeded;g' \ Makefile.inc || die + LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs lapack)" export LINK="$(tc-getFC)" fi sed -i -e "s;^\s*\(ORDERINGSF\s*=\).*;\1 ${ord};" Makefile.inc || die