| 1 |
commit: 26a497ed8c582fca811d58dc53ba88b3d9052ff0 |
| 2 |
Author: Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca> |
| 3 |
AuthorDate: Tue Jul 3 22:06:32 2012 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 3 22:06:32 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=26a497ed |
| 7 |
|
| 8 |
sci-libs/atlas: version bump. Adapt calls to compilers. Inherit multilib |
| 9 |
|
| 10 |
(Portage version: 2.2.01.20430-prefix/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
sci-libs/atlas/ChangeLog | 6 ++++ |
| 14 |
.../{atlas-3.9.80.ebuild => atlas-3.9.82.ebuild} | 20 +++++-------- |
| 15 |
sci-libs/atlas/files/3.9.63-leaks.patch | 29 -------------------- |
| 16 |
3 files changed, 14 insertions(+), 41 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog |
| 19 |
index 90dd1cd..8fcf843 100644 |
| 20 |
--- a/sci-libs/atlas/ChangeLog |
| 21 |
+++ b/sci-libs/atlas/ChangeLog |
| 22 |
@@ -2,6 +2,12 @@ |
| 23 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+*atlas-3.9.82 (03 Jul 2012) |
| 27 |
+ |
| 28 |
+ 03 Jul 2012; Sébastien Fabbro <bicatali@g.o> +atlas-3.9.82.ebuild, |
| 29 |
+ -atlas-3.9.80.ebuild, -files/3.9.63-leaks.patch: |
| 30 |
+ sci-libs/atlas: version bump. Adapt calls to compilers. Inherit multilib |
| 31 |
+ |
| 32 |
*atlas-3.9.80 (26 Jun 2012) |
| 33 |
|
| 34 |
26 Jun 2012; Sebastien Fabbro <fabbros@g.o> -atlas-3.9.79.ebuild, |
| 35 |
|
| 36 |
diff --git a/sci-libs/atlas/atlas-3.9.80.ebuild b/sci-libs/atlas/atlas-3.9.82.ebuild |
| 37 |
similarity index 96% |
| 38 |
rename from sci-libs/atlas/atlas-3.9.80.ebuild |
| 39 |
rename to sci-libs/atlas/atlas-3.9.82.ebuild |
| 40 |
index 311fef2..fa414ab 100644 |
| 41 |
--- a/sci-libs/atlas/atlas-3.9.80.ebuild |
| 42 |
+++ b/sci-libs/atlas/atlas-3.9.82.ebuild |
| 43 |
@@ -3,7 +3,7 @@ |
| 44 |
# $Header: $ |
| 45 |
|
| 46 |
EAPI=4 |
| 47 |
-inherit eutils toolchain-funcs fortran-2 versionator alternatives-2 |
| 48 |
+inherit eutils toolchain-funcs fortran-2 versionator alternatives-2 multilib |
| 49 |
|
| 50 |
LAPACKP=lapack-3.4.1.tgz |
| 51 |
|
| 52 |
@@ -48,18 +48,14 @@ pkg_setup() { |
| 53 |
|
| 54 |
src_configure() { |
| 55 |
atlas_configure() { |
| 56 |
- # hack needed to trick the flaky gcc detection |
| 57 |
- local mycc="$(tc-getCC)" |
| 58 |
- [[ ${mycc} == *gcc* ]] && mycc=gcc |
| 59 |
- |
| 60 |
local myconf=( |
| 61 |
- "--prefix=${ED}/usr" |
| 62 |
- "--libdir=${ED}/usr/$(get_libdir)" |
| 63 |
- "--incdir=${ED}/usr/include" |
| 64 |
- "--cc=${mycc}" |
| 65 |
- "-C ac ${mycc}" |
| 66 |
+ --prefix="${ED}/usr" |
| 67 |
+ --libdir="${ED}/usr/$(get_libdir)" |
| 68 |
+ --incdir="${ED}/usr/include" |
| 69 |
+ --cc="$(tc-getCC)" |
| 70 |
+ "-C acg '$(type -P $(tc-getCC))'" |
| 71 |
"-D c -DWALL" |
| 72 |
- "-F ac '${CFLAGS}'" |
| 73 |
+ "-F acg '${CFLAGS}'" |
| 74 |
"-Ss pmake '\$(MAKE) ${MAKEOPTS}'" |
| 75 |
) |
| 76 |
|
| 77 |
@@ -88,7 +84,7 @@ src_configure() { |
| 78 |
fi |
| 79 |
if use fortran; then |
| 80 |
myconf+=( |
| 81 |
- "-C if $(tc-getFC)" |
| 82 |
+ "-C if '$(type -P $(tc-getFC))'" |
| 83 |
"-F if '${FFLAGS}'" |
| 84 |
) |
| 85 |
if use lapack; then |
| 86 |
|
| 87 |
diff --git a/sci-libs/atlas/files/3.9.63-leaks.patch b/sci-libs/atlas/files/3.9.63-leaks.patch |
| 88 |
deleted file mode 100644 |
| 89 |
index d87e9c9..0000000 |
| 90 |
--- a/sci-libs/atlas/files/3.9.63-leaks.patch |
| 91 |
+++ /dev/null |
| 92 |
@@ -1,29 +0,0 @@ |
| 93 |
---- CONFIG/src/atlconf_misc.c.orig 2012-01-11 16:00:42.000000000 +0000 |
| 94 |
-+++ CONFIG/src/atlconf_misc.c 2012-01-23 19:33:37.000000000 +0000 |
| 95 |
-@@ -439,6 +439,7 @@ |
| 96 |
- assert(cmnd); |
| 97 |
- sprintf(cmnd, "%s -m", uname); |
| 98 |
- res = atlsys_1L(targ, cmnd, 0, 0); |
| 99 |
-+ free(cmnd); |
| 100 |
- if (res) |
| 101 |
- { |
| 102 |
- if (strstr(res, "ppc") || strstr(res, "Power Macintosh") || |
| 103 |
-@@ -707,6 +708,7 @@ |
| 104 |
- assert(cmnd); |
| 105 |
- sprintf(cmnd, "%s --version", comp); |
| 106 |
- res = atlsys_1L(NULL, cmnd, 0, 0); |
| 107 |
-+ free(cmnd); |
| 108 |
- if (res) |
| 109 |
- { |
| 110 |
- /* |
| 111 |
---- CONFIG/src/config.c.orig 2012-01-23 19:41:11.000000000 +0000 |
| 112 |
-+++ CONFIG/src/config.c 2012-01-24 04:46:25.000000000 +0000 |
| 113 |
-@@ -1102,7 +1105,7 @@ |
| 114 |
- else if (!strcmp(sp0, "kern")) |
| 115 |
- gcc3 = sp; |
| 116 |
- else if (!strcmp(sp0, "pmake")) |
| 117 |
-- *pmake = sp; |
| 118 |
-+ *pmake = NewStringCopy(sp); |
| 119 |
- else if (!strcmp(sp0, "flapack")) |
| 120 |
- *flapack = sp; |
| 121 |
- else if (!strcmp(sp0, "f77lib")) |
Archives