* [gentoo-commits] dev/bicatali:master commit in: sci-libs/scalapack/
@ 2011-02-25 17:49 Sebastien Fabbro
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro @ 2011-02-25 17:49 UTC (permalink / raw
To: gentoo-commits
commit: 4821a7c8ca5e479b61d2c75a6460413295ec13c3
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 17:48:39 2011 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 17:48:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=4821a7c8
more scalapack love. forced -j1
---
sci-libs/scalapack/Manifest | 2 +-
sci-libs/scalapack/scalapack-1.8.0.ebuild | 44 +++++++++++++---------------
2 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest
index c611d3f..d24e0bc 100644
--- a/sci-libs/scalapack/Manifest
+++ b/sci-libs/scalapack/Manifest
@@ -1,4 +1,4 @@
DIST scalapack-1.8.0.tgz 5006143 RMD160 4b0f607d18faa6b64415537124e89c4cb33bd06a SHA1 c185f71dda528e809e514dc02a3497817ce3af40 SHA256 e378dbedf67102cb7cc1a7991bb02bbe163aa91710dbeae2868ec781d3fc7a05
-EBUILD scalapack-1.8.0.ebuild 2533 RMD160 8bd4635336c56c89791e8061232addbc52c758a5 SHA1 2f95495037e41ebf1087e2f1ee9270a4e6184199 SHA256 0f1b2dee825b752d083e1bcb5707242172f473663eb1c575dd715f6a5f01600e
+EBUILD scalapack-1.8.0.ebuild 2927 RMD160 ad76894b80cd073f70c0b0486878cc86a88c5098 SHA1 1eb1033921842af7ea811d8097c5056dbfd38b11 SHA256 94d9261343ef4c2437c70cc460302d0aaedb9a8c7954faca56b89cbe9e855095
MISC ChangeLog 385 RMD160 0b11683799e82701061101d65e484a845d15b88c SHA1 7646afff6226d595a1b34d9a75f27bb376b2d041 SHA256 f14c196af54d1f100ea96fbbff72af4ed7496d0c0a78350e04c99eef2f2b8041
MISC metadata.xml 563 RMD160 d29391f1abe76c1663278ae6d35fe4128a9f511c SHA1 f794c3d2f48a908e306a05999b7264eccbb18da1 SHA256 1ee2c99e8e8d4f57ba1dce11797c19545734eb262725095909dcf3c80752fb3c
diff --git a/sci-libs/scalapack/scalapack-1.8.0.ebuild b/sci-libs/scalapack/scalapack-1.8.0.ebuild
index 3bb962d..3736927 100644
--- a/sci-libs/scalapack/scalapack-1.8.0.ebuild
+++ b/sci-libs/scalapack/scalapack-1.8.0.ebuild
@@ -28,31 +28,27 @@ make_shared_lib() {
-o $(dirname "${1}")/"${soname}" || return 1
}
-src_prepare() {
- cp SLmake.inc{.example,} || die
-}
-
src_configure() {
- MAKEFLAGS=(
- "home=${S}"
- "CDEFS=-DAdd_ -DNO_IEEE -DUsingMpiBlacs"
- "F77FLAGS=${FFLAGS}"
- "F77LOADFLAGS=${LDFLAGS}"
- "CCFLAGS=${CFLAGS}"
- "CCLOADFLAGS=${LDFLAGS}"
- "ARCH=$(tc-getAR)"
- "RANLIB=$(tc-getRANLIB)"
- "SMPLIB="
- "BLACSFINIT="
- "BLACSCINIT="
- "BLACSLIB=$(pkg-config --libs blacs)"
- "BLASLIB=$(pkg-config --libs blas)"
- "LAPACKLIB=$(pkg-config --libs lapack)"
- )
+ sed -e "s:\(^home[[:space:]]*=\).*:\1${S}:" \
+ -e "s:\(^CDEFS[[:space:]]*=\).*:\1-DAdd_ -DNO_IEEE -DUsingMpiBlacs:" \
+ -e "s:\(^F77FLAGS[[:space:]]*=\).*:\1${FFLAGS}:" \
+ -e "s:\(^F77LOADFLAGS[[:space:]]*=\).*:\1${LDFLAGS}:" \
+ -e "s:\(^CCFLAGS[[:space:]]*=\).*:\1${CFLAGS}:" \
+ -e "s:\(^CCLOADFLAGS[[:space:]]*=\).*:\1${LDFLAGS}:" \
+ -e "s:\(^ARCH[[:space:]]*=\).*:\1$(tc-getAR):" \
+ -e "s:\(^RANLIB[[:space:]]*=\).*:\1$(tc-getRANLIB):" \
+ -e "s:\(^SMPLIB[[:space:]]*=\).*:\1:" \
+ -e "s:\(^BLACSFINIT[[:space:]]*=\).*:\1:" \
+ -e "s:\(^BLACSCINIT[[:space:]]*=\).*:\1:" \
+ -e "s:\(^BLACSLIB[[:space:]]*=\).*:\1$(pkg-config --libs blacs):" \
+ -e "s:\(^BLASLIB[[:space:]]*=\).*:\1$(pkg-config --libs blas):" \
+ -e "s:\(^LAPACKLIB[[:space:]]*=\).*:\1$(pkg-config --libs lapack):" \
+ SLmake.inc.example > SLmake.inc || die
}
src_compile() {
- emake "${MAKEFLAGS[@]}" \
+ # removing -j1 could be tricky because of race to create archive
+ emake -j1 \
NOOPT="-fPIC" \
F77FLAGS="${FFLAGS} -fPIC" \
CCFLAGS="${CFLAGS} -fPIC" \
@@ -60,13 +56,13 @@ src_compile() {
local l
make_shared_lib lib${PN}.a mpicc || die "doing shared lib failed"
if use static-libs; then
- emake "${MAKEFLAGS[@]}" cleanlib && rm lib*.a
- emake "${MAKEFLAGS[@]}" || die "static libs failed"
+ emake cleanlib && rm lib*.a
+ emake || die "static libs failed"
fi
}
src_test() {
- emake "${MAKEFLAGS[@]}" exe || die "compile tests failed"
+ emake exe || die "compile tests failed"
cd TESTING
local x
for x in ./x*; do
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/scalapack/
@ 2011-05-31 20:12 Sebastien Fabbro
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro @ 2011-05-31 20:12 UTC (permalink / raw
To: gentoo-commits
commit: 86fd63fb8b042251ba7aa4b012a1a26fa6ce1d77
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 20:02:59 2011 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon May 30 20:02:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=86fd63fb
shared lib link fix
---
sci-libs/scalapack/Manifest | 2 +-
sci-libs/scalapack/scalapack-1.8.0.ebuild | 27 +++++++++++++--------------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest
index d24e0bc..25af93d 100644
--- a/sci-libs/scalapack/Manifest
+++ b/sci-libs/scalapack/Manifest
@@ -1,4 +1,4 @@
DIST scalapack-1.8.0.tgz 5006143 RMD160 4b0f607d18faa6b64415537124e89c4cb33bd06a SHA1 c185f71dda528e809e514dc02a3497817ce3af40 SHA256 e378dbedf67102cb7cc1a7991bb02bbe163aa91710dbeae2868ec781d3fc7a05
-EBUILD scalapack-1.8.0.ebuild 2927 RMD160 ad76894b80cd073f70c0b0486878cc86a88c5098 SHA1 1eb1033921842af7ea811d8097c5056dbfd38b11 SHA256 94d9261343ef4c2437c70cc460302d0aaedb9a8c7954faca56b89cbe9e855095
+EBUILD scalapack-1.8.0.ebuild 2885 RMD160 b44d75483d272f8ac9a06606037f79a17888c04c SHA1 70f526f3e58d2ac92fd22a85cf8c3f4011437837 SHA256 5bc6b9eb84c22f7fb762b10779818707e8d30800cb13acc8d6e4f7b3acc07aea
MISC ChangeLog 385 RMD160 0b11683799e82701061101d65e484a845d15b88c SHA1 7646afff6226d595a1b34d9a75f27bb376b2d041 SHA256 f14c196af54d1f100ea96fbbff72af4ed7496d0c0a78350e04c99eef2f2b8041
MISC metadata.xml 563 RMD160 d29391f1abe76c1663278ae6d35fe4128a9f511c SHA1 f794c3d2f48a908e306a05999b7264eccbb18da1 SHA256 1ee2c99e8e8d4f57ba1dce11797c19545734eb262725095909dcf3c80752fb3c
diff --git a/sci-libs/scalapack/scalapack-1.8.0.ebuild b/sci-libs/scalapack/scalapack-1.8.0.ebuild
index 3736927..1f3cc3e 100644
--- a/sci-libs/scalapack/scalapack-1.8.0.ebuild
+++ b/sci-libs/scalapack/scalapack-1.8.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI=4
inherit eutils toolchain-funcs versionator alternatives-2
DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous computing"
@@ -20,12 +20,14 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig"
make_shared_lib() {
+ local libstatic=${1}
local soname=$(basename "${1%.a}").so.$(get_major_version)
+ shift
einfo "Making ${soname}"
- ${2:-$(tc-getCC)} ${LDFLAGS} \
+ ${LINK:-$(tc-getCC)} ${LDFLAGS} \
-shared -Wl,-soname="${soname}" \
- -Wl,--whole-archive "${1}" -Wl,--no-whole-archive \
- -o $(dirname "${1}")/"${soname}" || return 1
+ -Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \
+ "$@" -o $(dirname "${libstatic}")/"${soname}" || die "${soname} failed"
}
src_configure() {
@@ -47,22 +49,21 @@ src_configure() {
}
src_compile() {
- # removing -j1 could be tricky because of race to create archive
+ # removing -j1 is tricky because of race to create archive
emake -j1 \
NOOPT="-fPIC" \
F77FLAGS="${FFLAGS} -fPIC" \
- CCFLAGS="${CFLAGS} -fPIC" \
- || die "shared libs failed"
+ CCFLAGS="${CFLAGS} -fPIC"
local l
- make_shared_lib lib${PN}.a mpicc || die "doing shared lib failed"
+ LINK=mpicc make_shared_lib lib${PN}.a $(pkg-config --libs blas lapack blacs)
if use static-libs; then
emake cleanlib && rm lib*.a
- emake || die "static libs failed"
+ emake -j1
fi
}
src_test() {
- emake exe || die "compile tests failed"
+ emake exe
cd TESTING
local x
for x in ./x*; do
@@ -74,12 +75,10 @@ src_test() {
src_install() {
cd LIB
for l in lib*.so.*; do
- dolib.so ${l} || die
+ dolib.so ${l}
dosym ${l} /usr/$(get_libdir)/${l%.*}
done
- if use static-libs; then
- dolib.a lib*.a || die
- fi
+ use static-libs && dolib.a lib*.a
cd "${S}"
insinto /usr/include/${PN}
doins PBLAS/SRC/*.h || die
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-31 20:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-31 20:12 [gentoo-commits] dev/bicatali:master commit in: sci-libs/scalapack/ Sebastien Fabbro
-- strict thread matches above, loose matches on Subject: below --
2011-02-25 17:49 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox