| 1 |
commit: 4821a7c8ca5e479b61d2c75a6460413295ec13c3 |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 25 17:48:39 2011 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 25 17:48:39 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=4821a7c8 |
| 7 |
|
| 8 |
more scalapack love. forced -j1 |
| 9 |
|
| 10 |
--- |
| 11 |
sci-libs/scalapack/Manifest | 2 +- |
| 12 |
sci-libs/scalapack/scalapack-1.8.0.ebuild | 44 +++++++++++++--------------- |
| 13 |
2 files changed, 21 insertions(+), 25 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest |
| 16 |
index c611d3f..d24e0bc 100644 |
| 17 |
--- a/sci-libs/scalapack/Manifest |
| 18 |
+++ b/sci-libs/scalapack/Manifest |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
DIST scalapack-1.8.0.tgz 5006143 RMD160 4b0f607d18faa6b64415537124e89c4cb33bd06a SHA1 c185f71dda528e809e514dc02a3497817ce3af40 SHA256 e378dbedf67102cb7cc1a7991bb02bbe163aa91710dbeae2868ec781d3fc7a05 |
| 21 |
-EBUILD scalapack-1.8.0.ebuild 2533 RMD160 8bd4635336c56c89791e8061232addbc52c758a5 SHA1 2f95495037e41ebf1087e2f1ee9270a4e6184199 SHA256 0f1b2dee825b752d083e1bcb5707242172f473663eb1c575dd715f6a5f01600e |
| 22 |
+EBUILD scalapack-1.8.0.ebuild 2927 RMD160 ad76894b80cd073f70c0b0486878cc86a88c5098 SHA1 1eb1033921842af7ea811d8097c5056dbfd38b11 SHA256 94d9261343ef4c2437c70cc460302d0aaedb9a8c7954faca56b89cbe9e855095 |
| 23 |
MISC ChangeLog 385 RMD160 0b11683799e82701061101d65e484a845d15b88c SHA1 7646afff6226d595a1b34d9a75f27bb376b2d041 SHA256 f14c196af54d1f100ea96fbbff72af4ed7496d0c0a78350e04c99eef2f2b8041 |
| 24 |
MISC metadata.xml 563 RMD160 d29391f1abe76c1663278ae6d35fe4128a9f511c SHA1 f794c3d2f48a908e306a05999b7264eccbb18da1 SHA256 1ee2c99e8e8d4f57ba1dce11797c19545734eb262725095909dcf3c80752fb3c |
| 25 |
|
| 26 |
diff --git a/sci-libs/scalapack/scalapack-1.8.0.ebuild b/sci-libs/scalapack/scalapack-1.8.0.ebuild |
| 27 |
index 3bb962d..3736927 100644 |
| 28 |
--- a/sci-libs/scalapack/scalapack-1.8.0.ebuild |
| 29 |
+++ b/sci-libs/scalapack/scalapack-1.8.0.ebuild |
| 30 |
@@ -28,31 +28,27 @@ make_shared_lib() { |
| 31 |
-o $(dirname "${1}")/"${soname}" || return 1 |
| 32 |
} |
| 33 |
|
| 34 |
-src_prepare() { |
| 35 |
- cp SLmake.inc{.example,} || die |
| 36 |
-} |
| 37 |
- |
| 38 |
src_configure() { |
| 39 |
- MAKEFLAGS=( |
| 40 |
- "home=${S}" |
| 41 |
- "CDEFS=-DAdd_ -DNO_IEEE -DUsingMpiBlacs" |
| 42 |
- "F77FLAGS=${FFLAGS}" |
| 43 |
- "F77LOADFLAGS=${LDFLAGS}" |
| 44 |
- "CCFLAGS=${CFLAGS}" |
| 45 |
- "CCLOADFLAGS=${LDFLAGS}" |
| 46 |
- "ARCH=$(tc-getAR)" |
| 47 |
- "RANLIB=$(tc-getRANLIB)" |
| 48 |
- "SMPLIB=" |
| 49 |
- "BLACSFINIT=" |
| 50 |
- "BLACSCINIT=" |
| 51 |
- "BLACSLIB=$(pkg-config --libs blacs)" |
| 52 |
- "BLASLIB=$(pkg-config --libs blas)" |
| 53 |
- "LAPACKLIB=$(pkg-config --libs lapack)" |
| 54 |
- ) |
| 55 |
+ sed -e "s:\(^home[[:space:]]*=\).*:\1${S}:" \ |
| 56 |
+ -e "s:\(^CDEFS[[:space:]]*=\).*:\1-DAdd_ -DNO_IEEE -DUsingMpiBlacs:" \ |
| 57 |
+ -e "s:\(^F77FLAGS[[:space:]]*=\).*:\1${FFLAGS}:" \ |
| 58 |
+ -e "s:\(^F77LOADFLAGS[[:space:]]*=\).*:\1${LDFLAGS}:" \ |
| 59 |
+ -e "s:\(^CCFLAGS[[:space:]]*=\).*:\1${CFLAGS}:" \ |
| 60 |
+ -e "s:\(^CCLOADFLAGS[[:space:]]*=\).*:\1${LDFLAGS}:" \ |
| 61 |
+ -e "s:\(^ARCH[[:space:]]*=\).*:\1$(tc-getAR):" \ |
| 62 |
+ -e "s:\(^RANLIB[[:space:]]*=\).*:\1$(tc-getRANLIB):" \ |
| 63 |
+ -e "s:\(^SMPLIB[[:space:]]*=\).*:\1:" \ |
| 64 |
+ -e "s:\(^BLACSFINIT[[:space:]]*=\).*:\1:" \ |
| 65 |
+ -e "s:\(^BLACSCINIT[[:space:]]*=\).*:\1:" \ |
| 66 |
+ -e "s:\(^BLACSLIB[[:space:]]*=\).*:\1$(pkg-config --libs blacs):" \ |
| 67 |
+ -e "s:\(^BLASLIB[[:space:]]*=\).*:\1$(pkg-config --libs blas):" \ |
| 68 |
+ -e "s:\(^LAPACKLIB[[:space:]]*=\).*:\1$(pkg-config --libs lapack):" \ |
| 69 |
+ SLmake.inc.example > SLmake.inc || die |
| 70 |
} |
| 71 |
|
| 72 |
src_compile() { |
| 73 |
- emake "${MAKEFLAGS[@]}" \ |
| 74 |
+ # removing -j1 could be tricky because of race to create archive |
| 75 |
+ emake -j1 \ |
| 76 |
NOOPT="-fPIC" \ |
| 77 |
F77FLAGS="${FFLAGS} -fPIC" \ |
| 78 |
CCFLAGS="${CFLAGS} -fPIC" \ |
| 79 |
@@ -60,13 +56,13 @@ src_compile() { |
| 80 |
local l |
| 81 |
make_shared_lib lib${PN}.a mpicc || die "doing shared lib failed" |
| 82 |
if use static-libs; then |
| 83 |
- emake "${MAKEFLAGS[@]}" cleanlib && rm lib*.a |
| 84 |
- emake "${MAKEFLAGS[@]}" || die "static libs failed" |
| 85 |
+ emake cleanlib && rm lib*.a |
| 86 |
+ emake || die "static libs failed" |
| 87 |
fi |
| 88 |
} |
| 89 |
|
| 90 |
src_test() { |
| 91 |
- emake "${MAKEFLAGS[@]}" exe || die "compile tests failed" |
| 92 |
+ emake exe || die "compile tests failed" |
| 93 |
cd TESTING |
| 94 |
local x |
| 95 |
for x in ./x*; do |
Archives