| 1 |
commit: f9d56e0d1b7e6d1b9a91461ce82d1d3eacb240bb |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 31 22:43:56 2011 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 31 22:43:56 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=f9d56e0d |
| 7 |
|
| 8 |
removed libm stuff. shared lib work. eapi4 |
| 9 |
|
| 10 |
--- |
| 11 |
sci-libs/xblas/ChangeLog | 6 +++- |
| 12 |
sci-libs/xblas/Manifest | 4 +- |
| 13 |
sci-libs/xblas/xblas-1.0.248.ebuild | 47 ++++++++++++++++++---------------- |
| 14 |
3 files changed, 32 insertions(+), 25 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-libs/xblas/ChangeLog b/sci-libs/xblas/ChangeLog |
| 17 |
index 651b274..15973e1 100644 |
| 18 |
--- a/sci-libs/xblas/ChangeLog |
| 19 |
+++ b/sci-libs/xblas/ChangeLog |
| 20 |
@@ -1,7 +1,11 @@ |
| 21 |
# ChangeLog for sci-libs/xblas |
| 22 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+ 31 May 2011; Sébastien Fabbro <bicatali@g.o> xblas-1.0.248.ebuild: |
| 27 |
+ Removed libm dependendency. Make shared lib consistent with other numeric |
| 28 |
+ libraries packages. Switched to EAPI4. |
| 29 |
+ |
| 30 |
09 Nov 2010; Sébastien Fabbro <bicatali@g.o> xblas-1.0.248.ebuild: |
| 31 |
Added eselect profile |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/sci-libs/xblas/Manifest b/sci-libs/xblas/Manifest |
| 35 |
index 8c723a1..6c8b390 100644 |
| 36 |
--- a/sci-libs/xblas/Manifest |
| 37 |
+++ b/sci-libs/xblas/Manifest |
| 38 |
@@ -1,4 +1,4 @@ |
| 39 |
DIST xblas-1.0.248.tar.gz 2087424 RMD160 32e1b394efd9293000b669330c538718f5cef47b SHA1 dbe70a98c500db759f13031a4a951715ca3ba967 SHA256 b5fe7c71c2da1ed9bcdc5784a12c5fa9fb417577513fe8a38de5de0007f7aaa1 |
| 40 |
-EBUILD xblas-1.0.248.ebuild 1836 RMD160 486ac3b2665d2f8e7e7f7b50572761e7669aa68d SHA1 faeee152d79746c5bfb52600a954d7e467c532ed SHA256 afaa1342a3709c3f081a8fa42c3baaa6b2af0f421b8cb7de6b5377ae7b821b05 |
| 41 |
-MISC ChangeLog 301 RMD160 332cbe9ae3dc7bf6ea3b31c9401dbdb5725b4d5a SHA1 0446ae623aaaf7efd239cd5c0e9716c5a3c9a4db SHA256 3fbd4b1ceaae27f6b7585128ee4926f489252ee4c9e06c2228c5aeb19a971e72 |
| 42 |
+EBUILD xblas-1.0.248.ebuild 1808 RMD160 91d7ce0d4bc1fe9b2d8cd2b37e72012a992c0243 SHA1 8a06add92f13a1ff395bcd01932b176123cf6892 SHA256 5e2d0d9db7df8d29716d89d2228265ee53e32a0000140775db17b5e0c5f602ce |
| 43 |
+MISC ChangeLog 496 RMD160 b98257455476b79929f891c6f926c1098b9e5c43 SHA1 db78825b2bf55f85fe2a976ee9243c9643e04e20 SHA256 2b41bc0dcac0e0c4483e8a5e7d3ee7319be19a98825bd98af023c5d226c2962c |
| 44 |
MISC metadata.xml 457 RMD160 51e6f1c9e69901d204fd13ff2ecf76b571475d91 SHA1 0ae2141ee2e201a00dbbffb96cd8f473ea2c44cc SHA256 40b841bb013b90fe241b2a532c04ee6dfbb4684d9f4889878bfd7f38df311dc3 |
| 45 |
|
| 46 |
diff --git a/sci-libs/xblas/xblas-1.0.248.ebuild b/sci-libs/xblas/xblas-1.0.248.ebuild |
| 47 |
index ea7f3f2..2d10435 100644 |
| 48 |
--- a/sci-libs/xblas/xblas-1.0.248.ebuild |
| 49 |
+++ b/sci-libs/xblas/xblas-1.0.248.ebuild |
| 50 |
@@ -1,10 +1,10 @@ |
| 51 |
-# Copyright 1999-2010 Gentoo Foundation |
| 52 |
+# Copyright 1999-2011 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
# $Header: $ |
| 55 |
|
| 56 |
-EAPI=3 |
| 57 |
+EAPI=4 |
| 58 |
|
| 59 |
-inherit eutils flag-o-matic toolchain-funcs |
| 60 |
+inherit eutils flag-o-matic toolchain-funcs versionator |
| 61 |
|
| 62 |
DESCRIPTION="Extra Precise Basic Linear Algebra Subroutines" |
| 63 |
HOMEPAGE="http://www.netlib.org/xblas/" |
| 64 |
@@ -18,6 +18,17 @@ IUSE="doc fortran static-libs" |
| 65 |
DEPEND="" |
| 66 |
RDEPEND="" |
| 67 |
|
| 68 |
+make_shared_lib() { |
| 69 |
+ local libstatic=${1} |
| 70 |
+ local soname=$(basename "${1%.a}").so.$(get_major_version) |
| 71 |
+ shift |
| 72 |
+ einfo "Making ${soname}" |
| 73 |
+ ${LINK:-$(tc-getCC)} ${LDFLAGS} \ |
| 74 |
+ -shared -Wl,-soname="${soname}" \ |
| 75 |
+ -Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \ |
| 76 |
+ "$@" -o $(dirname "${libstatic}")/"${soname}" || die "${soname} failed" |
| 77 |
+} |
| 78 |
+ |
| 79 |
src_configure() { |
| 80 |
econf $(use_enable fortran) |
| 81 |
} |
| 82 |
@@ -27,37 +38,29 @@ src_compile() { |
| 83 |
# build first static libs because of fPIC afterwards |
| 84 |
# and we link tests with shared ones |
| 85 |
if use static-libs; then |
| 86 |
- emake makefiles || die "generation of makefiles failed" |
| 87 |
- emake lib || die "emake library failed" |
| 88 |
- # remove everything but libxblas.a |
| 89 |
+ emake makefiles |
| 90 |
+ emake lib XBLASLIB=lib${PN}_nonpic.a |
| 91 |
emake clean |
| 92 |
fi |
| 93 |
sed -i \ |
| 94 |
-e 's:\(CFLAGS.*\).*:\1 -fPIC:' \ |
| 95 |
- -e "s:\(XBLASLIB.*=\).*:\1lib${PN}_pic.a:" \ |
| 96 |
make.inc || die |
| 97 |
- emake makefiles || die "generation of makefiles failed" |
| 98 |
- emake lib || die "emake library failed" |
| 99 |
- $(tc-getAR) x lib${PN}_pic.a || die |
| 100 |
- $(tc-getCC) -shared ${LDFLAGS} -Wl,-soname=lib${PN}.so.1 \ |
| 101 |
- $( $(tc-getAR) t lib${PN}_pic.a) \ |
| 102 |
- -lm -o lib${PN}.so.1 || die |
| 103 |
+ emake makefiles |
| 104 |
+ emake lib |
| 105 |
+ make_shared_lib lib${PN}.a |
| 106 |
} |
| 107 |
|
| 108 |
src_test() { |
| 109 |
- emake tests || die "emake tests failed" |
| 110 |
+ emake tests |
| 111 |
} |
| 112 |
|
| 113 |
src_install() { |
| 114 |
- dolib.so lib${PN}.so.1 || die |
| 115 |
- dosym lib${PN}.so.1 /usr/$(get_libdir)/lib${PN}.so |
| 116 |
- if use static-libs; then |
| 117 |
- dolib.a lib${PN}.a || die |
| 118 |
- fi |
| 119 |
+ dolib.so lib${PN}.so.* |
| 120 |
+ dosym lib${PN}.so.* /usr/$(get_libdir)/lib${PN}.so |
| 121 |
+ use static-libs && newlib.a lib${PN}_nonpic.a lib${PN}.a |
| 122 |
dodoc README README.devel |
| 123 |
- if use doc; then |
| 124 |
- doins doc/report.ps || die |
| 125 |
- fi |
| 126 |
+ use doc && dodoc doc/report.ps |
| 127 |
+ |
| 128 |
# pkg-config file for our multliple blas stuff |
| 129 |
cat > ${PN}.pc <<-EOF |
| 130 |
prefix=${EPREFIX}/usr |
Archives