1 |
bicatali 08/06/23 14:43:38 |
2 |
|
3 |
Modified: ChangeLog acml-4.1.0-r1.ebuild |
4 |
Log: |
5 |
Added gfortran fetch for x86, now available on amd website |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.37 sci-libs/acml/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/ChangeLog?rev=1.37&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/ChangeLog?rev=1.37&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/ChangeLog?r1=1.36&r2=1.37 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v |
18 |
retrieving revision 1.36 |
19 |
retrieving revision 1.37 |
20 |
diff -u -r1.36 -r1.37 |
21 |
--- ChangeLog 27 May 2008 10:16:17 -0000 1.36 |
22 |
+++ ChangeLog 23 Jun 2008 14:43:38 -0000 1.37 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for sci-libs/acml |
25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.36 2008/05/27 10:16:17 bicatali Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.37 2008/06/23 14:43:38 bicatali Exp $ |
28 |
+ |
29 |
+ 23 Jun 2008; Sébastien Fabbro <bicatali@g.o> acml-4.1.0-r1.ebuild: |
30 |
+ Added gfortran fetch for x86, now available on amd website |
31 |
|
32 |
27 May 2008; Sébastien Fabbro <bicatali@g.o> -acml-4.1.0.ebuild, |
33 |
acml-4.1.0-r1.ebuild: |
34 |
|
35 |
|
36 |
|
37 |
1.3 sci-libs/acml/acml-4.1.0-r1.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/acml-4.1.0-r1.ebuild?rev=1.3&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/acml-4.1.0-r1.ebuild?rev=1.3&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/acml/acml-4.1.0-r1.ebuild?r1=1.2&r2=1.3 |
42 |
|
43 |
Index: acml-4.1.0-r1.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.1.0-r1.ebuild,v |
46 |
retrieving revision 1.2 |
47 |
retrieving revision 1.3 |
48 |
diff -u -r1.2 -r1.3 |
49 |
--- acml-4.1.0-r1.ebuild 27 May 2008 10:16:17 -0000 1.2 |
50 |
+++ acml-4.1.0-r1.ebuild 23 Jun 2008 14:43:38 -0000 1.3 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2008 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.1.0-r1.ebuild,v 1.2 2008/05/27 10:16:17 bicatali Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.1.0-r1.ebuild,v 1.3 2008/06/23 14:43:38 bicatali Exp $ |
56 |
|
57 |
EAPI="1" |
58 |
|
59 |
@@ -19,14 +19,10 @@ |
60 |
!ifc? ( |
61 |
!gfortran? ( ${MY_P}-gfortran-64bit.tgz |
62 |
int64? ( ${MY_P}-gfortran-64bit-int64.tgz ) ) ) ) |
63 |
- x86? ( ${MY_P}-ifort-32bit.tgz )" |
64 |
- |
65 |
-# Once gfortran builds appear, replace x86? |
66 |
-# and remove the hack_x86 in the ebuild |
67 |
-# x86? ( |
68 |
-# ifc? ( ${MY_P}-ifort-32bit.tgz ) |
69 |
-# gfortran? ( ${MY_P}-gfortran-32bit.tgz ) |
70 |
-# !ifc? ( !gfortran ( ${MY_P}-gfortran-32bit.tgz ) ) )" |
71 |
+ x86? ( |
72 |
+ ifc? ( ${MY_P}-ifort-32bit.tgz ) |
73 |
+ gfortran? ( ${MY_P}-gfortran-32bit.tgz ) |
74 |
+ !ifc? ( !gfortran? ( ${MY_P}-gfortran-32bit.tgz ) ) )" |
75 |
|
76 |
IUSE="doc examples gfortran ifc int64 openmp test" |
77 |
KEYWORDS="~amd64 ~x86" |
78 |
@@ -35,13 +31,9 @@ |
79 |
LICENSE="ACML" |
80 |
SLOT="0" |
81 |
|
82 |
-# gfortran? ( sys-devel/gcc:4.2 ) |
83 |
-# !gfortran? ( !ifc? ( sys-devel/gcc:4.2 ) ) ) |
84 |
-# hack_x86 |
85 |
CDEPEND="ifc? ( dev-lang/ifc ) |
86 |
- amd64? ( gfortran? ( sys-devel/gcc:4.2 ) |
87 |
- !gfortran? ( !ifc? ( amd64? ( sys-devel/gcc:4.2 ) ) ) ) |
88 |
- x86? ( dev-lang/ifc )" |
89 |
+ gfortran? ( sys-devel/gcc:4.2 ) |
90 |
+ !gfortran? ( !ifc? ( sys-devel/gcc:4.2 ) )" |
91 |
|
92 |
DEPEND="test? ( ${CDEPEND} ) |
93 |
app-admin/eselect-blas |
94 |
@@ -64,18 +56,11 @@ |
95 |
} |
96 |
|
97 |
pkg_setup() { |
98 |
- # hack_x86 |
99 |
- if use x86 && ! use ifc; then |
100 |
- ewarn "On x86 architectures, acml is only available with ifc." |
101 |
- ewarn "Make sure you have proper licenses to use ifc" |
102 |
- fi |
103 |
FORTRAN="" |
104 |
if use test; then |
105 |
use gfortran && FORTRAN="${FORTRAN} gfortran" |
106 |
use ifc && FORTRAN="${FORTRAN} ifc" |
107 |
use gfortran || use ifc || FORTRAN="gfortran" |
108 |
- # hack_x86 |
109 |
- use x86 && FORTRAN="ifc" |
110 |
fortran_pkg_setup |
111 |
# work around incomplete fortran eclass |
112 |
if use gfortran && |
113 |
@@ -90,9 +75,7 @@ |
114 |
# construct default profile dprof from default ddir |
115 |
local ddir=gfortran |
116 |
use ifc && ddir=ifort |
117 |
- # hack_x86 |
118 |
- use x86 && ddir=ifort32 || ddir=ifort64 |
119 |
- #use x86 && ddir=${ddir}32 || ddir=${ddir}64 |
120 |
+ use x86 && ddir=${ddir}32 || ddir=${ddir}64 |
121 |
use openmp && ddir=${ddir}_mp |
122 |
use int64 && ddir=${ddir}_int64 |
123 |
ACML_DEFAULT_DIR=${ddir} |
124 |
|
125 |
|
126 |
|
127 |
-- |
128 |
gentoo-commits@l.g.o mailing list |