| 1 |
commit: f535d5d3c67807cb5b6a5db6ea42430bf369467a |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 30 18:40:53 2011 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 30 18:40:53 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=f535d5d3 |
| 7 |
|
| 8 |
cosmetics |
| 9 |
|
| 10 |
--- |
| 11 |
sci-libs/cblas-reference/Manifest | 2 +- |
| 12 |
.../cblas-reference-20110218.ebuild | 18 ++++++++++-------- |
| 13 |
2 files changed, 11 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sci-libs/cblas-reference/Manifest b/sci-libs/cblas-reference/Manifest |
| 16 |
index 87249ee..8bf2861 100644 |
| 17 |
--- a/sci-libs/cblas-reference/Manifest |
| 18 |
+++ b/sci-libs/cblas-reference/Manifest |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
DIST cblas-reference-20110218.tgz 197468 RMD160 ab908605311ad5dfe280c5fb0e6a1e94156b7a04 SHA1 d6970cf52592ef67674a61c78bbd055a4e9d4680 SHA256 0f6354fd67fabd909baf57ced2ef84e962db58fae126e4f41b21dd4fec60a2a3 |
| 21 |
-EBUILD cblas-reference-20110218.ebuild 2377 RMD160 4a6d5c4aa6936a14c49d1cbc193c39be7c902eed SHA1 a2c24d0b744f7341b3b501ca1d4d9cd04478fac6 SHA256 c5d853960000626e50aa997996c42ff5cafac5b756bd194ec2f8cfd5a58066bd |
| 22 |
+EBUILD cblas-reference-20110218.ebuild 2433 RMD160 7b1783836cfd65ca423a46fc07c38eda8151295d SHA1 31de7ad116fd9ccbaf6d823b310dd5dadad3aa03 SHA256 adc4ac6c8f6d7abb62d555a6a96f11923bc4a924d70541fa5e339ec572722355 |
| 23 |
MISC ChangeLog 6624 RMD160 0d7fa08716f83149dc18005871dd6b1b094b273d SHA1 7da65bcee3e62e2f838eef8fdb52bf48a1d15233 SHA256 31b834eb10ab4312392b935f9d39b8a9ecbe378792ae8d37fc22332234e1b460 |
| 24 |
MISC metadata.xml 747 RMD160 93e7287d9fb76504fcffa359adca454d42518e33 SHA1 b4fb783c4233b29cf30a9576905d9943f6d6ed0c SHA256 d184bbc83e471aa894863f9350d4c13a096d22c513e2a4de53d9075c5e4d9fa8 |
| 25 |
|
| 26 |
diff --git a/sci-libs/cblas-reference/cblas-reference-20110218.ebuild b/sci-libs/cblas-reference/cblas-reference-20110218.ebuild |
| 27 |
index f6f0b2e..fe64b08 100644 |
| 28 |
--- a/sci-libs/cblas-reference/cblas-reference-20110218.ebuild |
| 29 |
+++ b/sci-libs/cblas-reference/cblas-reference-20110218.ebuild |
| 30 |
@@ -25,15 +25,17 @@ DEPEND="${RDEPEND} |
| 31 |
S="${WORKDIR}/CBLAS" |
| 32 |
|
| 33 |
LIBNAME=refcblas |
| 34 |
-LIBVERS=3 |
| 35 |
+LIBVER=3 |
| 36 |
|
| 37 |
make_shared_lib() { |
| 38 |
- local soname=$(basename "${1%.a}").so.${LIBVERS} |
| 39 |
+ local libstatic=${1} |
| 40 |
+ local soname=$(basename "${1%.a}").so.${LIBVER} |
| 41 |
+ shift |
| 42 |
einfo "Making ${soname}" |
| 43 |
- ${2:-$(tc-getCC)} ${LDFLAGS} \ |
| 44 |
+ ${LINK:-$(tc-getCC)} ${LDFLAGS} \ |
| 45 |
-shared -Wl,-soname="${soname}" \ |
| 46 |
- -Wl,--whole-archive "${1}" -Wl,--no-whole-archive \ |
| 47 |
- $(pkg-config --libs blas) -o $(dirname "${1}")/"${soname}" || return 1 |
| 48 |
+ -Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \ |
| 49 |
+ "$@" -o $(dirname "${libstatic}")/"${soname}" || die "${soname} failed" |
| 50 |
} |
| 51 |
|
| 52 |
src_prepare() { |
| 53 |
@@ -59,7 +61,7 @@ src_compile() { |
| 54 |
CBLIB=../lib/lib${LIBNAME}.a \ |
| 55 |
alllib |
| 56 |
cd lib |
| 57 |
- make_shared_lib lib${LIBNAME}.a || die |
| 58 |
+ make_shared_lib lib${LIBNAME}.a $(pkg-config --libs blas) |
| 59 |
cd "${S}" |
| 60 |
if use static-libs; then |
| 61 |
emake clean |
| 62 |
@@ -74,8 +76,8 @@ src_test() { |
| 63 |
} |
| 64 |
|
| 65 |
src_install() { |
| 66 |
- dolib.so lib/lib${LIBNAME}.so.${LIBVERS} |
| 67 |
- dosym lib${LIBNAME}.so.${LIBVERS} /usr/$(get_libdir)/lib${LIBNAME}.so |
| 68 |
+ dolib.so lib/lib${LIBNAME}.so.${LIBVER} |
| 69 |
+ dosym lib${LIBNAME}.so.${LIBVER} /usr/$(get_libdir)/lib${LIBNAME}.so |
| 70 |
use static-libs && dolib.a lib/lib${LIBNAME}.a |
| 71 |
insinto /usr/include/cblas |
| 72 |
doins include/cblas.h |
Archives