Gentoo Archives: gentoo-commits

From: Sebastien Fabbro <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/coinor-csdp/
Date: Tue, 29 Jan 2013 22:30:50
Message-Id: 1359498567.20af819f6eda6b9c56c739bf4eb52ab1feba96cc.bicatali@gentoo
1 commit: 20af819f6eda6b9c56c739bf4eb52ab1feba96cc
2 Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 29 22:29:27 2013 +0000
4 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 29 22:29:27 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=20af819f
7
8 sci-libs/coinor-csdp: use generic pkg-config
9
10 Package-Manager: portage-2.2.01.21688-prefix
11
12 ---
13 sci-libs/coinor-csdp/ChangeLog | 5 ++++-
14 sci-libs/coinor-csdp/coinor-csdp-6.1.1.ebuild | 8 ++++----
15 2 files changed, 8 insertions(+), 5 deletions(-)
16
17 diff --git a/sci-libs/coinor-csdp/ChangeLog b/sci-libs/coinor-csdp/ChangeLog
18 index 2d2878e..2e42019 100644
19 --- a/sci-libs/coinor-csdp/ChangeLog
20 +++ b/sci-libs/coinor-csdp/ChangeLog
21 @@ -1,7 +1,10 @@
22 # ChangeLog for sci-libs/coinor-csdp
23 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
24 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
25 # $Header: $
26
27 + 29 Jan 2013; Sébastien Fabbro <bicatali@g.o> coinor-csdp-6.1.1.ebuild:
28 + sci-libs/coinor-csdp: use generic pkg-config
29 +
30 *coinor-csdp-6.1.1 (20 Jul 2012)
31
32 20 Jul 2012; Sébastien Fabbro <bicatali@g.o> +coinor-csdp-6.1.1.ebuild,
33
34 diff --git a/sci-libs/coinor-csdp/coinor-csdp-6.1.1.ebuild b/sci-libs/coinor-csdp/coinor-csdp-6.1.1.ebuild
35 index c819222..3c5a3fc 100644
36 --- a/sci-libs/coinor-csdp/coinor-csdp-6.1.1.ebuild
37 +++ b/sci-libs/coinor-csdp/coinor-csdp-6.1.1.ebuild
38 @@ -1,8 +1,8 @@
39 -# Copyright 1999-2012 Gentoo Foundation
40 +# Copyright 1999-2013 Gentoo Foundation
41 # Distributed under the terms of the GNU General Public License v2
42 # $Header: $
43
44 -EAPI=4
45 +EAPI=5
46
47 inherit versionator toolchain-funcs flag-o-matic multilib
48
49 @@ -65,7 +65,7 @@ src_prepare() {
50 append-cflags -DUSEOPENMP
51 fi
52 use amd64 && append-cflags -DBIT64
53 - [[ $(pkg-config --libs blas) =~ -latlas ]] && append-cflags -DUSEATLAS
54 + [[ $($(tc-getPKG_CONFIG) --libs blas) =~ -latlas ]] && append-cflags -DUSEATLAS
55 sed -i \
56 -e "s:-O3:${CFLAGS}:" \
57 -e "s:ar :$(tc-getAR) :" \
58 @@ -74,7 +74,7 @@ src_prepare() {
59
60 src_compile() {
61 emake CFLAGS="${CFLAGS} -fPIC" -C lib
62 - local libs="$(pkg-config --libs blas lapack)"
63 + local libs="$($(tc-getPKG_CONFIG) --libs blas lapack)"
64 static_to_shared lib/libsdp.a ${libs}
65 use static-libs && emake -C lib clean && emake -C lib
66 emake -C solver LIBS="${libs} -L../lib -lsdp"