From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SqVHr-0006dQ-31 for garchives@archives.gentoo.org; Sun, 15 Jul 2012 20:19:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23AE6E057F; Sun, 15 Jul 2012 20:19:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EDBDCE057F for ; Sun, 15 Jul 2012 20:19:19 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 582921B4159 for ; Sun, 15 Jul 2012 20:19:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 77BA3E543C for ; Sun, 15 Jul 2012 20:19:17 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <1342383545.1666778ddfbeb170b3e09cc0af0f5d14986d2e3a.bicatali@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/mumps/ChangeLog sci-libs/mumps/mumps-4.10.0-r1.ebuild X-VCS-Directories: sci-libs/mumps/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: 1666778ddfbeb170b3e09cc0af0f5d14986d2e3a X-VCS-Branch: master Date: Sun, 15 Jul 2012 20:19:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b8ce578e-3767-4cef-bce5-70c3e7d4b9cf X-Archives-Hash: 5bec4c6f4e2c86974735fbf09251bb64 commit: 1666778ddfbeb170b3e09cc0af0f5d14986d2e3a Author: Sebastien Fabbro uvic ca> AuthorDate: Sun Jul 15 20:19:05 2012 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Sun Jul 15 20:19:05 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D1666778d 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: $ =20 + 15 Jul 2012; S=C3=A9bastien Fabbro mumps-4.10.0-= r1.ebuild: + sci-libs/mumps: Merge dummy sequential mpi into sequential mumps + 13 Jul 2012; S=C3=A9bastien Fabbro mumps-4.10.0.= ebuild: sci-libs/mumps: fix underlinking for sequential library =20 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*=3D\).*:\1$(tc-getCC):" \ -e "s:^\(FC\s*=3D\).*:\1$(tc-getFC):" \ -e "s:^\(FL\s*=3D\).*:\1$(tc-getFC):" \ - -e "s:^\(AR\s*=3D\).*:\1$(tc-getAR) rv :" \ + -e "s:^\(AR\s*=3D\).*:\1$(tc-getAR) cr :" \ -e "s:^\(RANLIB\s*=3D\).*:\1$(tc-getRANLIB):" \ -e "s:^\(LIBBLAS\s*=3D\).*:\1$(pkg-config --libs blas):" \ -e "s:^\(INCPAR\s*=3D\).*:\1:" \ @@ -116,7 +116,6 @@ src_configure() { -e "s:^\(SCALAP\s*=3D\).*:\1:" \ -e 's:^LIBSEQNEEDED =3D:LIBSEQNEEDED =3D libseqneeded:g' \ Makefile.inc || die - LIBADD=3D"${LIBADD} -Llibseq -lmpiseq" export LINK=3D"$(tc-getFC)" fi sed -i -e "s:^\s*\(ORDERINGSF\s*=3D\).*:\1 ${ord}:" Makefile.inc || die @@ -124,7 +123,11 @@ src_configure() { =20 src_compile() { emake alllib PIC=3D"-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