| 1 |
commit: bf895d3c343fe466c08d7f900c6a876a43cf43e4 |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 9 18:47:38 2013 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 9 18:47:38 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bf895d3c |
| 7 |
|
| 8 |
sci-libs/plasma: Version bump |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.7-prefix |
| 11 |
|
| 12 |
--- |
| 13 |
sci-libs/plasma/ChangeLog | 3 +++ |
| 14 |
sci-libs/plasma/plasma-2.5.2.ebuild | 25 ++++++++++++++++--------- |
| 15 |
2 files changed, 19 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/plasma/ChangeLog b/sci-libs/plasma/ChangeLog |
| 18 |
index 63aa673..6311120 100644 |
| 19 |
--- a/sci-libs/plasma/ChangeLog |
| 20 |
+++ b/sci-libs/plasma/ChangeLog |
| 21 |
@@ -2,6 +2,9 @@ |
| 22 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
+ 09 Dec 2013; Sébastien Fabbro <bicatali@g.o> plasma-2.5.2.ebuild: |
| 26 |
+ sci-libs/plasma: Version bump |
| 27 |
+ |
| 28 |
*plasma-2.5.1 (12 Jul 2013) |
| 29 |
|
| 30 |
12 Jul 2013; Sébastien Fabbro <bicatali@g.o> +plasma-2.5.1.ebuild: |
| 31 |
|
| 32 |
diff --git a/sci-libs/plasma/plasma-2.5.2.ebuild b/sci-libs/plasma/plasma-2.5.2.ebuild |
| 33 |
index 5609c24..0d4af6a 100644 |
| 34 |
--- a/sci-libs/plasma/plasma-2.5.2.ebuild |
| 35 |
+++ b/sci-libs/plasma/plasma-2.5.2.ebuild |
| 36 |
@@ -3,7 +3,7 @@ |
| 37 |
# $Header: $ |
| 38 |
|
| 39 |
EAPI=5 |
| 40 |
-inherit eutils fortran-2 toolchain-funcs versionator multilib |
| 41 |
+inherit eutils fortran-2 toolchain-funcs versionator multilib flag-o-matic |
| 42 |
|
| 43 |
MYP=${PN}_${PV} |
| 44 |
|
| 45 |
@@ -55,7 +55,15 @@ static_to_shared() { |
| 46 |
} |
| 47 |
|
| 48 |
src_prepare() { |
| 49 |
- # distributed pc file not so useful |
| 50 |
+ # rename plasma to avoid collision (https://github.com/gentoo-science/sci/issues/34) |
| 51 |
+ # lib name conflict with kde plasma, rename |
| 52 |
+ PLASMA_LIBNAME=plasmca |
| 53 |
+ sed -i \ |
| 54 |
+ -e "s/-lplasma/-l${PLASMA_LIBNAME}/g" \ |
| 55 |
+ -e "s/libplasma.a/lib${PLASMA_LIBNAME}.a/" \ |
| 56 |
+ Makefile.internal || die |
| 57 |
+ |
| 58 |
+ # distributed pc file not so useful, so redo it |
| 59 |
cat <<-EOF > ${PN}.pc |
| 60 |
prefix=${EPREFIX}/usr |
| 61 |
libdir=\${prefix}/$(get_libdir) |
| 62 |
@@ -64,7 +72,7 @@ src_prepare() { |
| 63 |
Description: ${DESCRIPTION} |
| 64 |
Version: ${PV} |
| 65 |
URL: ${HOMEPAGE} |
| 66 |
- Libs: -L\${libdir} -lplasmca -lcoreblas -lquark |
| 67 |
+ Libs: -L\${libdir} -l${PLASMA_LIBNAME} -lcoreblas -lquark |
| 68 |
Libs.private: -lm |
| 69 |
Cflags: -I\${includedir} |
| 70 |
Requires: blas cblas lapack lapacke hwloc |
| 71 |
@@ -78,12 +86,12 @@ src_configure() { |
| 72 |
RANLIB = $(tc-getRANLIB) |
| 73 |
CC = $(tc-getCC) |
| 74 |
FC = $(tc-getFC) |
| 75 |
- CFLAGS = ${CFLAGS} -DADD_ -fPIC |
| 76 |
+ CFLAGS = ${CFLAGS} -DADD_ -fPIC $(has_version ">=virtual/lapacke-3.5" && echo "-DDOXYGEN_SHOULD_SKIP_THIS=1") |
| 77 |
FFLAGS = ${FFLAGS} -fPIC |
| 78 |
LOADER = $(tc-getFC) |
| 79 |
LIBBLAS = $($(tc-getPKG_CONFIG) --libs blas) |
| 80 |
LIBCBLAS = $($(tc-getPKG_CONFIG) --libs cblas) |
| 81 |
- LIBLAPACK = $($(tc-getPKG_CONFIG) --libs lapack) |
| 82 |
+ LIBLAPACK = $($(tc-getPKG_CONFIG) --libs lapack) -ltmglib |
| 83 |
LIBCLAPACK = $($(tc-getPKG_CONFIG) --libs lapacke) |
| 84 |
$(use fortran && echo "PLASMA_F90 = 1") |
| 85 |
EOF |
| 86 |
@@ -91,11 +99,10 @@ src_configure() { |
| 87 |
|
| 88 |
src_compile() { |
| 89 |
emake lib |
| 90 |
- # rename plasma to avoid collision (https://github.com/gentoo-science/sci/issues/34) |
| 91 |
- mv lib/libplasm{,c}a.a || die |
| 92 |
+ #mv lib/libplasma.a lib/lib${PLASMA_LIBNAME}.a || die |
| 93 |
static_to_shared quark/libquark.a $($(tc-getPKG_CONFIG --libs hwloc)) -pthread |
| 94 |
static_to_shared lib/libcoreblas.a quark/libquark.so $($(tc-getPKG_CONFIG --libs cblas lapacke)) |
| 95 |
- static_to_shared lib/libplasmca.a quark/libquark.so lib/libcoreblas.so |
| 96 |
+ static_to_shared lib/lib${PLASMA_LIBNAME}.a quark/libquark.so lib/libcoreblas.so |
| 97 |
if use static-libs; then |
| 98 |
emake cleanall |
| 99 |
sed 's/-fPIC//g' make.inc |
| 100 |
@@ -127,7 +134,7 @@ src_install() { |
| 101 |
} |
| 102 |
|
| 103 |
pkg_postinst() { |
| 104 |
- elog "The plasma linear algebra library has been renamed plasmca" |
| 105 |
+ elog "The plasma linear algebra library file has been renamed ${PLASMA_LIBNAME}" |
| 106 |
elog "to avoid collision with KDE plasma." |
| 107 |
elog "Compile and link your programs using the following command:" |
| 108 |
elog " pkg-config --cflags --libs plasma" |
Archives