Gentoo Archives: gentoo-commits

From: "Andrey Kislyuk (weaver)" <weaver@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-biology/raxml: ChangeLog raxml-7.2.2.ebuild
Date: Fri, 04 Sep 2009 14:22:28
Message-Id: E1MjeUp-0003S0-VM@stork.gentoo.org
1 weaver 09/09/04 19:30:55
2
3 Modified: ChangeLog raxml-7.2.2.ebuild
4 Log:
5 Tweak build process
6 (Portage version: 2.2_rc30/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.3 sci-biology/raxml/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/raxml/ChangeLog?rev=1.3&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/raxml/ChangeLog?rev=1.3&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/raxml/ChangeLog?r1=1.2&r2=1.3
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/sci-biology/raxml/ChangeLog,v
18 retrieving revision 1.2
19 retrieving revision 1.3
20 diff -u -r1.2 -r1.3
21 --- ChangeLog 4 Sep 2009 19:12:50 -0000 1.2
22 +++ ChangeLog 4 Sep 2009 19:30:55 -0000 1.3
23 @@ -1,6 +1,9 @@
24 # ChangeLog for sci-biology/raxml
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/ChangeLog,v 1.2 2009/09/04 19:12:50 weaver Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/ChangeLog,v 1.3 2009/09/04 19:30:55 weaver Exp $
28 +
29 + 04 Sep 2009; Andrey Kislyuk <weaver@g.o> raxml-7.2.2.ebuild:
30 + Tweak build process
31
32 *raxml-7.2.2 (04 Sep 2009)
33
34
35
36
37 1.2 sci-biology/raxml/raxml-7.2.2.ebuild
38
39 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/raxml/raxml-7.2.2.ebuild?rev=1.2&view=markup
40 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/raxml/raxml-7.2.2.ebuild?rev=1.2&content-type=text/plain
41 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/raxml/raxml-7.2.2.ebuild?r1=1.1&r2=1.2
42
43 Index: raxml-7.2.2.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/sci-biology/raxml/raxml-7.2.2.ebuild,v
46 retrieving revision 1.1
47 retrieving revision 1.2
48 diff -u -r1.1 -r1.2
49 --- raxml-7.2.2.ebuild 4 Sep 2009 19:12:50 -0000 1.1
50 +++ raxml-7.2.2.ebuild 4 Sep 2009 19:30:55 -0000 1.2
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2009 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/raxml-7.2.2.ebuild,v 1.1 2009/09/04 19:12:50 weaver Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/raxml-7.2.2.ebuild,v 1.2 2009/09/04 19:30:55 weaver Exp $
56
57 EAPI="2"
58
59 @@ -15,7 +15,7 @@
60 IUSE="+threads"
61 KEYWORDS="~amd64 ~x86"
62
63 -# errors compiling mpi for version 7.2.2. mpi is enabled by adding -DPARALLEL to CFLAGS
64 +# mpi is not supported in version 7.2.2. mpi is enabled by adding -DPARALLEL to CFLAGS
65 DEPEND="" # mpi? ( virtual/mpi )"
66 RDEPEND="${DEPEND}"
67
68 @@ -28,11 +28,15 @@
69 }
70
71 src_compile() {
72 - emake -f Makefile.SSE3.gcc || die
73 - if use threads; then emake -f Makefile.SSE3.PTHREADS.gcc clean && emake -f Makefile.SSE3.PTHREADS.gcc || die; fi
74 + emake -f Makefile.gcc || die
75 + emake -f Makefile.SSE3.gcc clean && emake -f Makefile.SSE3.gcc || die
76 + if use threads; then
77 + emake -f Makefile.PTHREADS.gcc clean && emake -f Makefile.PTHREADS.gcc || die
78 + emake -f Makefile.SSE3.PTHREADS.gcc clean && emake -f Makefile.SSE3.PTHREADS.gcc || die
79 + fi
80 }
81
82 src_install() {
83 - dobin raxmlHPC-SSE3 || die
84 - if use threads; then dobin raxmlHPC-PTHREADS-SSE3 || die; fi
85 + dobin raxmlHPC raxmlHPC-SSE3 || die
86 + if use threads; then dobin raxmlHPC-PTHREADS raxmlHPC-PTHREADS-SSE3 || die; fi
87 }