Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/fftw: fftw-3.3.3-r2.ebuild metadata.xml fftw-3.3.4.ebuild ChangeLog
Date: Thu, 29 Jan 2015 22:57:04
Message-Id: 20150129225700.1AB75109EC@oystercatcher.gentoo.org
1 mgorny 15/01/29 22:57:00
2
3 Modified: fftw-3.3.3-r2.ebuild metadata.xml fftw-3.3.4.ebuild
4 ChangeLog
5 Log:
6 Convert to CPU_FLAGS_X86.
7
8 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
9
10 Revision Changes Path
11 1.13 sci-libs/fftw/fftw-3.3.3-r2.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild?rev=1.13&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild?rev=1.13&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild?r1=1.12&r2=1.13
16
17 Index: fftw-3.3.3-r2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v
20 retrieving revision 1.12
21 retrieving revision 1.13
22 diff -u -r1.12 -r1.13
23 --- fftw-3.3.3-r2.ebuild 26 Sep 2013 17:32:45 -0000 1.12
24 +++ fftw-3.3.3-r2.ebuild 29 Jan 2015 22:57:00 -0000 1.13
25 @@ -1,6 +1,6 @@
26 -# Copyright 1999-2013 Gentoo Foundation
27 +# Copyright 1999-2015 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.12 2013/09/26 17:32:45 ago Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.13 2015/01/29 22:57:00 mgorny Exp $
31
32 EAPI=5
33
34 @@ -16,7 +16,7 @@
35 LICENSE="GPL-2"
36 SLOT="3.0"
37 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
38 -IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus"
39 +IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus"
40
41 # there is no abi_x86_32 port of virtual/mpi right now
42 REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )"
43 @@ -70,7 +70,7 @@
44 local x=${MULTIBUILD_VARIANT}
45
46 myeconfargs=(
47 - $(use_enable fma)
48 + $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
49 $(use_enable fortran)
50 $(use_enable zbus mips-zbus-timer)
51 $(use_enable threads)
52 @@ -81,15 +81,15 @@
53 myeconfargs+=(
54 --enable-single
55 $(use_enable altivec)
56 - $(use_enable avx)
57 - $(use_enable sse)
58 + $(use_enable cpu_flags_x86_avx avx)
59 + $(use_enable cpu_flags_x86_sse sse)
60 $(use_enable mpi)
61 $(use_enable neon)
62 )
63 elif [[ $x == double ]]; then
64 myeconfargs+=(
65 - $(use_enable avx)
66 - $(use_enable sse2)
67 + $(use_enable cpu_flags_x86_avx avx)
68 + $(use_enable cpu_flags_x86_sse2 sse2)
69 $(use_enable mpi)
70 )
71 elif [[ $x == longdouble ]]; then
72
73
74
75 1.14 sci-libs/fftw/metadata.xml
76
77 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/metadata.xml?rev=1.14&view=markup
78 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/metadata.xml?rev=1.14&content-type=text/plain
79 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/metadata.xml?r1=1.13&r2=1.14
80
81 Index: metadata.xml
82 ===================================================================
83 RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/metadata.xml,v
84 retrieving revision 1.13
85 retrieving revision 1.14
86 diff -u -r1.13 -r1.14
87 --- metadata.xml 26 Sep 2013 17:48:57 -0000 1.13
88 +++ metadata.xml 29 Jan 2015 22:57:00 -0000 1.14
89 @@ -12,10 +12,8 @@
90 publicly available FFT software.
91 </longdescription>
92 <use>
93 - <flag name="avx">Adds support for Advanced Vector Extensions</flag>
94 <flag name="float">Link default library to single precision instead of
95 double (symlinks only and fftw-2.1)</flag>
96 - <flag name="fma">Use the Fused Multiply Add instruction set (fma3/fma4 either one)</flag>
97 <flag name="quad">Build quadruple precision lib</flag>
98 <flag name="zbus">Adds support for ZBus cycle-counter of mips</flag>
99 </use>
100
101
102
103 1.6 sci-libs/fftw/fftw-3.3.4.ebuild
104
105 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild?rev=1.6&view=markup
106 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild?rev=1.6&content-type=text/plain
107 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild?r1=1.5&r2=1.6
108
109 Index: fftw-3.3.4.ebuild
110 ===================================================================
111 RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v
112 retrieving revision 1.5
113 retrieving revision 1.6
114 diff -u -r1.5 -r1.6
115 --- fftw-3.3.4.ebuild 2 Sep 2014 15:09:29 -0000 1.5
116 +++ fftw-3.3.4.ebuild 29 Jan 2015 22:57:00 -0000 1.6
117 @@ -1,6 +1,6 @@
118 -# Copyright 1999-2014 Gentoo Foundation
119 +# Copyright 1999-2015 Gentoo Foundation
120 # Distributed under the terms of the GNU General Public License v2
121 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.5 2014/09/02 15:09:29 dev-zero Exp $
122 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.6 2015/01/29 22:57:00 mgorny Exp $
123
124 EAPI=5
125
126 @@ -23,7 +23,7 @@
127
128 LICENSE="GPL-2"
129 SLOT="3.0/3"
130 -IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus"
131 +IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus"
132
133 RDEPEND="
134 mpi? ( virtual/mpi )
135 @@ -88,7 +88,7 @@
136 fi
137
138 local myeconfargs=(
139 - $(use_enable fma)
140 + $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
141 $(use_enable fortran)
142 $(use_enable zbus mips-zbus-timer)
143 $(use_enable threads)
144 @@ -99,15 +99,15 @@
145 myeconfargs+=(
146 --enable-single
147 $(use_enable altivec)
148 - $(use_enable avx)
149 - $(use_enable sse)
150 + $(use_enable cpu_flags_x86_avx avx)
151 + $(use_enable cpu_flags_x86_sse sse)
152 ${enable_mpi}
153 $(use_enable neon)
154 )
155 elif [[ $x == double ]]; then
156 myeconfargs+=(
157 - $(use_enable avx)
158 - $(use_enable sse2)
159 + $(use_enable cpu_flags_x86_avx avx)
160 + $(use_enable cpu_flags_x86_sse2 sse2)
161 ${enable_mpi}
162 )
163 elif [[ $x == longdouble ]]; then
164
165
166
167 1.162 sci-libs/fftw/ChangeLog
168
169 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.162&view=markup
170 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.162&content-type=text/plain
171 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?r1=1.161&r2=1.162
172
173 Index: ChangeLog
174 ===================================================================
175 RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v
176 retrieving revision 1.161
177 retrieving revision 1.162
178 diff -u -r1.161 -r1.162
179 --- ChangeLog 2 Sep 2014 15:09:29 -0000 1.161
180 +++ ChangeLog 29 Jan 2015 22:57:00 -0000 1.162
181 @@ -1,6 +1,10 @@
182 # ChangeLog for sci-libs/fftw
183 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
184 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.161 2014/09/02 15:09:29 dev-zero Exp $
185 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
186 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.162 2015/01/29 22:57:00 mgorny Exp $
187 +
188 + 29 Jan 2015; Michał Górny <mgorny@g.o> fftw-3.3.3-r2.ebuild,
189 + fftw-3.3.4.ebuild, metadata.xml:
190 + Convert to CPU_FLAGS_X86.
191
192 02 Sep 2014; Tiziano Müller <dev-zero@g.o> fftw-3.3.4.ebuild:
193 Disable parallel ABI-install (bug #521044).