1 |
commit: 303b4c8da495c7a33795a7b3caff4edcc09d4d55 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 27 17:05:10 2013 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 27 17:05:10 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=303b4c8d |
7 |
|
8 |
sci-mathematics/Macaulay2: Use PKG_CONFIG instead of generic pkg-config |
9 |
|
10 |
Package-Manager: portage-2.2.0_alpha163 |
11 |
|
12 |
--- |
13 |
sci-mathematics/Macaulay2/ChangeLog | 4 ++++ |
14 |
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 1 + |
15 |
sci-mathematics/Macaulay2/files/9999-lapack.patch | 2 +- |
16 |
3 files changed, 6 insertions(+), 1 deletions(-) |
17 |
|
18 |
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog |
19 |
index ec1c9af..e164ec1 100644 |
20 |
--- a/sci-mathematics/Macaulay2/ChangeLog |
21 |
+++ b/sci-mathematics/Macaulay2/ChangeLog |
22 |
@@ -2,6 +2,10 @@ |
23 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
24 |
# $Header: $ |
25 |
|
26 |
+ 27 Feb 2013; Justin Lecher <jlec@g.o> files/9999-lapack.patch, |
27 |
+ Macaulay2-9999.ebuild: |
28 |
+ Use PKG_CONFIG instead of generic pkg-config |
29 |
+ |
30 |
22 Feb 2013; Justin Lecher <jlec@g.o> Macaulay2-9999.ebuild, |
31 |
metadata.xml: |
32 |
Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config# |
33 |
|
34 |
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild |
35 |
index b182641..b25ac45 100644 |
36 |
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild |
37 |
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild |
38 |
@@ -82,6 +82,7 @@ pkg_setup () { |
39 |
} |
40 |
|
41 |
src_prepare() { |
42 |
+ tc-export PKG_CONFIG |
43 |
# Put updated Normaliz.m2 in place |
44 |
cp "${WORKDIR}/Normaliz2.8/Macaulay2/Normaliz.m2" \ |
45 |
"${S}/Macaulay2/packages" || die |
46 |
|
47 |
diff --git a/sci-mathematics/Macaulay2/files/9999-lapack.patch b/sci-mathematics/Macaulay2/files/9999-lapack.patch |
48 |
index 3798253..e9a434e 100644 |
49 |
--- a/sci-mathematics/Macaulay2/files/9999-lapack.patch |
50 |
+++ b/sci-mathematics/Macaulay2/files/9999-lapack.patch |
51 |
@@ -44,7 +44,7 @@ |
52 |
- AC_MSG_ERROR(the fortran compiler ($FC) does not support the Fortran 90 language required for compiling lapack), |
53 |
- AC_MSG_RESULT(yes)) |
54 |
-fi |
55 |
-+BUILTLIBS="$(pkg-config --libs lapack) $BUILTLIBS" |
56 |
++BUILTLIBS="$(${PKG_CONFIG} --libs lapack) $BUILTLIBS" |
57 |
|
58 |
if test $BUILD_memtailor = yes |
59 |
then BUILTLIBS="-lmemtailor $BUILTLIBS" |