| 1 |
commit: fd55f70bf5a95d685aa76fcced3d6cefe1110506 |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 30 17:52:54 2011 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 30 17:52:54 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=fd55f70b |
| 7 |
|
| 8 |
soname fix and file collision simplified |
| 9 |
|
| 10 |
--- |
| 11 |
sci-libs/blas-reference/ChangeLog | 6 ++++ |
| 12 |
sci-libs/blas-reference/Manifest | 4 +- |
| 13 |
...3.3.1.ebuild => blas-reference-3.3.1-r1.ebuild} | 26 +++++++------------- |
| 14 |
...mkl-10.3.2.137.ebuild => mkl-10.3.4.191.ebuild} | 0 |
| 15 |
4 files changed, 17 insertions(+), 19 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/blas-reference/ChangeLog b/sci-libs/blas-reference/ChangeLog |
| 18 |
index 40b0dc7..0e4b68c 100644 |
| 19 |
--- a/sci-libs/blas-reference/ChangeLog |
| 20 |
+++ b/sci-libs/blas-reference/ChangeLog |
| 21 |
@@ -2,6 +2,12 @@ |
| 22 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
+*blas-reference-3.3.1-r1 (30 May 2011) |
| 26 |
+ |
| 27 |
+ 30 May 2011; Sébastien Fabbro <bicatali@g.o> |
| 28 |
+ -blas-reference-3.3.1.ebuild, +blas-reference-3.3.1-r1.ebuild: |
| 29 |
+ Moved soname to librefblas.so. Avoid colliion in configure time |
| 30 |
+ |
| 31 |
*blas-reference-3.3.1 (20 Apr 2011) |
| 32 |
|
| 33 |
20 Apr 2011; Sébastien Fabbro <bicatali@g.o> |
| 34 |
|
| 35 |
diff --git a/sci-libs/blas-reference/Manifest b/sci-libs/blas-reference/Manifest |
| 36 |
index e3aeef2..05eebcc 100644 |
| 37 |
--- a/sci-libs/blas-reference/Manifest |
| 38 |
+++ b/sci-libs/blas-reference/Manifest |
| 39 |
@@ -1,4 +1,4 @@ |
| 40 |
DIST lapack-3.3.1.tgz 4945204 RMD160 5e9d90122110045e07351f3ab30dc4e2b43d52db SHA1 3ce437e05f0e9a3c8148ec41922f6efeef0ebdac SHA256 56821ab51c29369a34e5085728f92c549a9aa926f26acf7eeac87b61eed329e4 |
| 41 |
-EBUILD blas-reference-3.3.1.ebuild 2114 RMD160 f9f202753bf55549803e93a56cb0778c625194a7 SHA1 4695ee9951c226f1fcf091f1b3794bd9c553fe24 SHA256 e840e5c8633a0d3095b24e037f434427a8e57c508026356954ea23f266e63556 |
| 42 |
-MISC ChangeLog 681 RMD160 2f0cc8d8a9b8899f2c50bcd1042ff3509a9fb442 SHA1 964fcfb393fb2df3fa2f0a6900bc9166e99bfb64 SHA256 28182879310c58b82448eceecd2cd45497a3f556699095211f92b10d43d8ecd1 |
| 43 |
+EBUILD blas-reference-3.3.1-r1.ebuild 1844 RMD160 47c0521532f4bfd96dccd582fb3df6a4b5b15087 SHA1 78b1a7340a457420f841d11157b6c1b742adc053 SHA256 002e97e6ae0f33d2033e3a811d185cc03c82f0a1091e91b2a6509fa5efb1eec4 |
| 44 |
+MISC ChangeLog 908 RMD160 48e902a566baa8376ad11b51c143c2aaa7e21835 SHA1 01f724aa3d0162db1288c2614b0b395fdb72a847 SHA256 b360c9a193019e4a2535b94ecc56bf1737ae7f69f0fdc20a47fb2897e66d036b |
| 45 |
MISC metadata.xml 710 RMD160 6aa878cc87922b654b257b0eb206ad396f9f1ada SHA1 d1ff141d6ed81b3d857bb4d0a9a898338b921a70 SHA256 cbca20da50d2838e9d252bfb06fe53f44e24a935d7601b24f7928fd8951e5350 |
| 46 |
|
| 47 |
diff --git a/sci-libs/blas-reference/blas-reference-3.3.1.ebuild b/sci-libs/blas-reference/blas-reference-3.3.1-r1.ebuild |
| 48 |
similarity index 72% |
| 49 |
rename from sci-libs/blas-reference/blas-reference-3.3.1.ebuild |
| 50 |
rename to sci-libs/blas-reference/blas-reference-3.3.1-r1.ebuild |
| 51 |
index b3a4b64..473701b 100644 |
| 52 |
--- a/sci-libs/blas-reference/blas-reference-3.3.1.ebuild |
| 53 |
+++ b/sci-libs/blas-reference/blas-reference-3.3.1-r1.ebuild |
| 54 |
@@ -25,6 +25,13 @@ DOCS=( README ) |
| 55 |
S="${WORKDIR}/${MYP}" |
| 56 |
|
| 57 |
src_prepare() { |
| 58 |
+ # avoid collision with other blas |
| 59 |
+ sed -i \ |
| 60 |
+ -e 's:blas:refblas:g' \ |
| 61 |
+ CMakeLists.txt BLAS/blas.pc.in BLAS/{SRC,TESTING}/CMakeLists.txt || die |
| 62 |
+ sed -i \ |
| 63 |
+ -e 's:BINARY_DIR}/blas:BINARY_DIR}/refblas:' \ |
| 64 |
+ BLAS/CMakeLists.txt || die |
| 65 |
export FC=$(tc-getFC) F77=$(tc-getF77) |
| 66 |
use static-libs && mkdir "${WORKDIR}/${PN}_static" |
| 67 |
} |
| 68 |
@@ -62,27 +69,12 @@ src_test() { |
| 69 |
popd > /dev/null |
| 70 |
} |
| 71 |
|
| 72 |
-# lapack_prof <blas|lapack> will install eselect and pkg-config file |
| 73 |
-lapack_prof() { |
| 74 |
- einfo "Creating profile for ${1}" |
| 75 |
- # rename blas to refblas and lapack to reflapack |
| 76 |
- # to avoid collision with other linked implementations |
| 77 |
- for f in "${ED}"/usr/$(get_libdir)/lib${1}.* ; do |
| 78 |
- mv ${f} ${f/lib${1}/libref${1}} || die |
| 79 |
- done |
| 80 |
- mv "${ED}"/usr/$(get_libdir)/pkgconfig/{,ref}${1}.pc || die |
| 81 |
- sed -i \ |
| 82 |
- -e "/Libs/s/${1}/ref${1}/" \ |
| 83 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/ref${1}.pc || die |
| 84 |
- alternatives_for ${1} reference 0 \ |
| 85 |
- "/usr/$(get_libdir)/pkgconfig/${1}.pc" "ref${1}.pc" |
| 86 |
-} |
| 87 |
- |
| 88 |
src_install() { |
| 89 |
cmake-utils_src_install -C BLAS |
| 90 |
if use static-libs; then |
| 91 |
CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \ |
| 92 |
cmake-utils_src_install -C BLAS |
| 93 |
fi |
| 94 |
- lapack_prof blas |
| 95 |
+ alternatives_for blas reference 0 \ |
| 96 |
+ "/usr/$(get_libdir)/pkgconfig/blas.pc" "refblas.pc" |
| 97 |
} |
| 98 |
|
| 99 |
diff --git a/sci-libs/mkl/mkl-10.3.2.137.ebuild b/sci-libs/mkl/mkl-10.3.4.191.ebuild |
| 100 |
similarity index 100% |
| 101 |
rename from sci-libs/mkl/mkl-10.3.2.137.ebuild |
| 102 |
rename to sci-libs/mkl/mkl-10.3.4.191.ebuild |
Archives