1 |
markusle 08/02/27 20:30:09 |
2 |
|
3 |
Modified: ChangeLog octave-2.1.73-r2.ebuild |
4 |
Log: |
5 |
Moved check for mpich2 useflag into its proper place. |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.53 sci-mathematics/octave/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.53&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.53&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/ChangeLog?r1=1.52&r2=1.53 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v |
18 |
retrieving revision 1.52 |
19 |
retrieving revision 1.53 |
20 |
diff -u -r1.52 -r1.53 |
21 |
--- ChangeLog 25 Dec 2007 14:32:22 -0000 1.52 |
22 |
+++ ChangeLog 27 Feb 2008 20:30:08 -0000 1.53 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for sci-mathematics/octave |
25 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.52 2007/12/25 14:32:22 phreak Exp $ |
27 |
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.53 2008/02/27 20:30:08 markusle Exp $ |
29 |
+ |
30 |
+ 27 Feb 2008; Markus Dittrich <markusle@g.o> |
31 |
+ octave-2.1.73-r2.ebuild: |
32 |
+ Moved check for mpich2 useflag into its proper place. |
33 |
|
34 |
25 Dec 2007; Christian Heim <phreak@g.o> metadata.xml: |
35 |
Removing metalgod from metadata.xml as per #99350. |
36 |
|
37 |
|
38 |
|
39 |
1.6 sci-mathematics/octave/octave-2.1.73-r2.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild?rev=1.6&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild?rev=1.6&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild?r1=1.5&r2=1.6 |
44 |
|
45 |
Index: octave-2.1.73-r2.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild,v |
48 |
retrieving revision 1.5 |
49 |
retrieving revision 1.6 |
50 |
diff -u -r1.5 -r1.6 |
51 |
--- octave-2.1.73-r2.ebuild 25 Dec 2007 01:46:56 -0000 1.5 |
52 |
+++ octave-2.1.73-r2.ebuild 27 Feb 2008 20:30:08 -0000 1.6 |
53 |
@@ -1,6 +1,6 @@ |
54 |
-# Copyright 1999-2007 Gentoo Foundation |
55 |
+# Copyright 1999-2008 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild,v 1.5 2007/12/25 01:46:56 nerdboy Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild,v 1.6 2008/02/27 20:30:08 markusle Exp $ |
59 |
|
60 |
inherit flag-o-matic fortran autotools xemacs-elisp-common |
61 |
|
62 |
@@ -63,21 +63,20 @@ |
63 |
# octave links agains -lmpi by default |
64 |
# mpich needs -lmpich instead |
65 |
if use mpi ; then |
66 |
- if built_with_use sys-cluster/mpich2 cxx ; then |
67 |
- elog "mpich2 must be built without C++ support!" |
68 |
- die "please rebuild mpich2 with USE=-cxx..." |
69 |
- else |
70 |
CC="mpicc" |
71 |
if has_version 'sys-cluster/mpich' ; then |
72 |
- CXX="mpiCC" |
73 |
- myconf="${myconf} --with-mpi=mpich" |
74 |
+ CXX="mpiCC" |
75 |
+ myconf="${myconf} --with-mpi=mpich" |
76 |
elif has_version 'sys-cluster/mpich2' ; then |
77 |
+ if built_with_use sys-cluster/mpich2 cxx ; then |
78 |
+ elog "mpich2 must be built without C++ support!" |
79 |
+ die "please rebuild mpich2 with USE=-cxx..." |
80 |
+ fi |
81 |
F77="mpif77" |
82 |
myconf="${myconf} --with-mpi=mpich" |
83 |
else |
84 |
myconf="${myconf} --with-mpi=mpi" |
85 |
fi |
86 |
- fi |
87 |
else |
88 |
CC="$(tc-getCC)" |
89 |
CXX="$(tc-getCXX)" |
90 |
|
91 |
|
92 |
|
93 |
-- |
94 |
gentoo-commits@l.g.o mailing list |