| 1 |
commit: 1b1a3746213966e6822d8b12732384d568d9acf8 |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 30 19:27:03 2011 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 30 19:27:03 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=1b1a3746 |
| 7 |
|
| 8 |
soname fix and cleaning |
| 9 |
|
| 10 |
--- |
| 11 |
sci-libs/lapack-reference/ChangeLog | 7 ++++ |
| 12 |
sci-libs/lapack-reference/Manifest | 4 +- |
| 13 |
...3.1.ebuild => lapack-reference-3.3.1-r1.ebuild} | 33 +++++++++---------- |
| 14 |
3 files changed, 25 insertions(+), 19 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog |
| 17 |
index e428c3e..d8d9988 100644 |
| 18 |
--- a/sci-libs/lapack-reference/ChangeLog |
| 19 |
+++ b/sci-libs/lapack-reference/ChangeLog |
| 20 |
@@ -2,6 +2,13 @@ |
| 21 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 22 |
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $ |
| 23 |
|
| 24 |
+*lapack-reference-3.3.1-r1 (30 May 2011) |
| 25 |
+ |
| 26 |
+ 30 May 2011; Sébastien Fabbro <bicatali@g.o> |
| 27 |
+ -lapack-reference-3.3.1.ebuild, +lapack-reference-3.3.1-r1.ebuild: |
| 28 |
+ Moved soname to libreflapack.so. Avoid collision in configure time with |
| 29 |
+ sed's. |
| 30 |
+ |
| 31 |
*lapack-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/lapack-reference/Manifest b/sci-libs/lapack-reference/Manifest |
| 36 |
index b08435b..a20bc07 100644 |
| 37 |
--- a/sci-libs/lapack-reference/Manifest |
| 38 |
+++ b/sci-libs/lapack-reference/Manifest |
| 39 |
@@ -1,6 +1,6 @@ |
| 40 |
AUX 3.3.1-blas-libs.patch 1587 RMD160 03521353a65fd465eb1ce9dcf87aec3a2c6dec51 SHA1 a323cb51941f834b4189f4635891dd63bd882ff6 SHA256 6cee0c40294eb51df7ac690df9f9da7c23362a3e8e44c200f53c84a963ad93a9 |
| 41 |
AUX 3.3.1-xblas-libs.patch 1397 RMD160 3b545ee8152d65652d5e2596c3ef990b33a28701 SHA1 ddfa2e72b099c458358e93bb54ea1968a81bf620 SHA256 89c35ca92f87815a17079c3111d54778a1818c53649228a7c23e2143039162da |
| 42 |
DIST lapack-3.3.1.tgz 4945204 RMD160 5e9d90122110045e07351f3ab30dc4e2b43d52db SHA1 3ce437e05f0e9a3c8148ec41922f6efeef0ebdac SHA256 56821ab51c29369a34e5085728f92c549a9aa926f26acf7eeac87b61eed329e4 |
| 43 |
-EBUILD lapack-reference-3.3.1.ebuild 2080 RMD160 51a0b2e3f766e69f2cf6b9ed17661de343adb190 SHA1 981ba739a0d47ab63f926587181d6df4526d4f3c SHA256 348a26d506f0df9cd4add2c4ddc4835d2657f39a6e6082ffb6ba2fe90701424d |
| 44 |
-MISC ChangeLog 10006 RMD160 13dc7601fb077e991d1aa48dca5c2a799c21f2bf SHA1 10cfc72812c4ed9d15407c248f32f6f5eab13c4d SHA256 4ec7b1e04aa8af5748de53308c653b8793fd28caf104717578c2e7a8cad9d8fd |
| 45 |
+EBUILD lapack-reference-3.3.1-r1.ebuild 1957 RMD160 e2b6656ca88d6f01cc19fd188ce3f5cbf6dd4107 SHA1 075644fa9541215a9640a04c0d8b8a01d4e548d2 SHA256 bab6a4e4cee23702a10ce4144bd09e8e2edcd2d60b31345e64abc471edbca1c9 |
| 46 |
+MISC ChangeLog 10256 RMD160 5eff170e6cc3970bc60bb600b9fdf3bf5852f755 SHA1 acf79fe1e008eea26c5deb90686a9e32f463e7d3 SHA256 90069297d014a43c29173a8cda4c182aef2058ba94c42b91929e6cd0d09ffec6 |
| 47 |
MISC metadata.xml 830 RMD160 a5533b2d94515312541e767895d6732e42aa49c3 SHA1 1392cdaf12cd4dcc3f64522af679460df968415f SHA256 9e83bfab904611e89bdbe5571dd571c43461a4eb8adae2e69381fddf819416a0 |
| 48 |
|
| 49 |
diff --git a/sci-libs/lapack-reference/lapack-reference-3.3.1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.3.1-r1.ebuild |
| 50 |
similarity index 73% |
| 51 |
rename from sci-libs/lapack-reference/lapack-reference-3.3.1.ebuild |
| 52 |
rename to sci-libs/lapack-reference/lapack-reference-3.3.1-r1.ebuild |
| 53 |
index 4d834a1..13e05e0 100644 |
| 54 |
--- a/sci-libs/lapack-reference/lapack-reference-3.3.1.ebuild |
| 55 |
+++ b/sci-libs/lapack-reference/lapack-reference-3.3.1-r1.ebuild |
| 56 |
@@ -30,6 +30,20 @@ src_prepare() { |
| 57 |
epatch \ |
| 58 |
"${FILESDIR}"/${PV}-blas-libs.patch \ |
| 59 |
"${FILESDIR}"/${PV}-xblas-libs.patch |
| 60 |
+ # avoid collision with other lapack |
| 61 |
+ sed -i \ |
| 62 |
+ -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/reflapack.pc:' \ |
| 63 |
+ -e '/export/s:lapack:reflapack:g' \ |
| 64 |
+ CMakeLists.txt || die |
| 65 |
+ sed -i \ |
| 66 |
+ -e 's:(lapack:(reflapack:g' \ |
| 67 |
+ SRC/CMakeLists.txt || die |
| 68 |
+ sed -i \ |
| 69 |
+ -e 's:lapack:reflapack:g' \ |
| 70 |
+ TESTING/*/CMakeLists.txt || die |
| 71 |
+ sed -i \ |
| 72 |
+ -e 's:-llapack:-lreflapack:g' \ |
| 73 |
+ lapack.pc.in || die |
| 74 |
export FC=$(tc-getFC) F77=$(tc-getF77) |
| 75 |
use static-libs && mkdir "${WORKDIR}/${PN}_static" |
| 76 |
} |
| 77 |
@@ -60,26 +74,11 @@ src_compile() { |
| 78 |
fi |
| 79 |
} |
| 80 |
|
| 81 |
-# lapack_prof <blas|lapack> will install eselect and pkg-config file |
| 82 |
-lapack_prof() { |
| 83 |
- einfo "Creating profile for ${1}" |
| 84 |
- # rename blas to refblas and lapack to reflapack |
| 85 |
- # to avoid collision with other linked implementations |
| 86 |
- for f in "${ED}"/usr/$(get_libdir)/lib${1}.* ; do |
| 87 |
- mv ${f} ${f/lib${1}/libref${1}} || die |
| 88 |
- done |
| 89 |
- mv "${ED}"/usr/$(get_libdir)/pkgconfig/{,ref}${1}.pc || die |
| 90 |
- sed -i \ |
| 91 |
- -e "/Libs/s/${1}/ref${1}/" \ |
| 92 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/ref${1}.pc || die |
| 93 |
- alternatives_for lapack reference 0 \ |
| 94 |
- "/usr/$(get_libdir)/pkgconfig/${1}.pc" "ref${1}.pc" |
| 95 |
-} |
| 96 |
- |
| 97 |
src_install() { |
| 98 |
cmake-utils_src_install |
| 99 |
if use static-libs; then |
| 100 |
CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install |
| 101 |
fi |
| 102 |
- lapack_prof lapack |
| 103 |
+ alternatives_for lapack reference 0 \ |
| 104 |
+ "/usr/$(get_libdir)/pkgconfig/lapack.pc" "reflapack.pc" |
| 105 |
} |
Archives