Gentoo Archives: gentoo-commits

From: Sebastien Fabbro <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/bicatali:master commit in: sci-libs/scalapack/
Date: Tue, 31 May 2011 20:13:06
Message-Id: 86fd63fb8b042251ba7aa4b012a1a26fa6ce1d77.bicatali@gentoo
1 commit: 86fd63fb8b042251ba7aa4b012a1a26fa6ce1d77
2 Author: S├ębastien Fabbro <bicatali <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 30 20:02:59 2011 +0000
4 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
5 CommitDate: Mon May 30 20:02:59 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=86fd63fb
7
8 shared lib link fix
9
10 ---
11 sci-libs/scalapack/Manifest | 2 +-
12 sci-libs/scalapack/scalapack-1.8.0.ebuild | 27 +++++++++++++--------------
13 2 files changed, 14 insertions(+), 15 deletions(-)
14
15 diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest
16 index d24e0bc..25af93d 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 2927 RMD160 ad76894b80cd073f70c0b0486878cc86a88c5098 SHA1 1eb1033921842af7ea811d8097c5056dbfd38b11 SHA256 94d9261343ef4c2437c70cc460302d0aaedb9a8c7954faca56b89cbe9e855095
22 +EBUILD scalapack-1.8.0.ebuild 2885 RMD160 b44d75483d272f8ac9a06606037f79a17888c04c SHA1 70f526f3e58d2ac92fd22a85cf8c3f4011437837 SHA256 5bc6b9eb84c22f7fb762b10779818707e8d30800cb13acc8d6e4f7b3acc07aea
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 3736927..1f3cc3e 100644
28 --- a/sci-libs/scalapack/scalapack-1.8.0.ebuild
29 +++ b/sci-libs/scalapack/scalapack-1.8.0.ebuild
30 @@ -2,7 +2,7 @@
31 # Distributed under the terms of the GNU General Public License v2
32 # $Header: $
33
34 -EAPI="3"
35 +EAPI=4
36 inherit eutils toolchain-funcs versionator alternatives-2
37
38 DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous computing"
39 @@ -20,12 +20,14 @@ DEPEND="${RDEPEND}
40 dev-util/pkgconfig"
41
42 make_shared_lib() {
43 + local libstatic=${1}
44 local soname=$(basename "${1%.a}").so.$(get_major_version)
45 + shift
46 einfo "Making ${soname}"
47 - ${2:-$(tc-getCC)} ${LDFLAGS} \
48 + ${LINK:-$(tc-getCC)} ${LDFLAGS} \
49 -shared -Wl,-soname="${soname}" \
50 - -Wl,--whole-archive "${1}" -Wl,--no-whole-archive \
51 - -o $(dirname "${1}")/"${soname}" || return 1
52 + -Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \
53 + "$@" -o $(dirname "${libstatic}")/"${soname}" || die "${soname} failed"
54 }
55
56 src_configure() {
57 @@ -47,22 +49,21 @@ src_configure() {
58 }
59
60 src_compile() {
61 - # removing -j1 could be tricky because of race to create archive
62 + # removing -j1 is tricky because of race to create archive
63 emake -j1 \
64 NOOPT="-fPIC" \
65 F77FLAGS="${FFLAGS} -fPIC" \
66 - CCFLAGS="${CFLAGS} -fPIC" \
67 - || die "shared libs failed"
68 + CCFLAGS="${CFLAGS} -fPIC"
69 local l
70 - make_shared_lib lib${PN}.a mpicc || die "doing shared lib failed"
71 + LINK=mpicc make_shared_lib lib${PN}.a $(pkg-config --libs blas lapack blacs)
72 if use static-libs; then
73 emake cleanlib && rm lib*.a
74 - emake || die "static libs failed"
75 + emake -j1
76 fi
77 }
78
79 src_test() {
80 - emake exe || die "compile tests failed"
81 + emake exe
82 cd TESTING
83 local x
84 for x in ./x*; do
85 @@ -74,12 +75,10 @@ src_test() {
86 src_install() {
87 cd LIB
88 for l in lib*.so.*; do
89 - dolib.so ${l} || die
90 + dolib.so ${l}
91 dosym ${l} /usr/$(get_libdir)/${l%.*}
92 done
93 - if use static-libs; then
94 - dolib.a lib*.a || die
95 - fi
96 + use static-libs && dolib.a lib*.a
97 cd "${S}"
98 insinto /usr/include/${PN}
99 doins PBLAS/SRC/*.h || die