1 |
ottxor 12/02/05 20:39:36 |
2 |
|
3 |
Modified: fftw-3.3-r2.ebuild ChangeLog |
4 |
Added: fftw-3.2.2-r2.ebuild |
5 |
Log: |
6 |
paired-single is only supported in fftw-3.2.* |
7 |
|
8 |
(Portage version: 2.2.0_alpha85/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 sci-libs/fftw/fftw-3.3-r2.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3-r2.ebuild?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3-r2.ebuild?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3-r2.ebuild?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: fftw-3.3-r2.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3-r2.ebuild,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- fftw-3.3-r2.ebuild 4 Feb 2012 21:45:07 -0000 1.1 |
24 |
+++ fftw-3.3-r2.ebuild 5 Feb 2012 20:39:36 -0000 1.2 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2012 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3-r2.ebuild,v 1.1 2012/02/04 21:45:07 ottxor Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3-r2.ebuild,v 1.2 2012/02/05 20:39:36 ottxor Exp $ |
30 |
|
31 |
EAPI=4 |
32 |
|
33 |
@@ -13,7 +13,7 @@ |
34 |
LICENSE="GPL-2" |
35 |
SLOT="3.0" |
36 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
37 |
-IUSE="altivec avx doc fortran mpi openmp paired-single quad sse sse2 static-libs threads zbus" |
38 |
+IUSE="altivec avx doc fortran mpi openmp quad sse sse2 static-libs threads zbus" |
39 |
|
40 |
DEPEND=" |
41 |
fortran? ( virtual/fortran[openmp?] ) |
42 |
@@ -68,7 +68,6 @@ |
43 |
$(use_enable altivec) |
44 |
$(use_enable avx) |
45 |
$(use_enable sse) |
46 |
- $(use_enable paired-single mips-ps) |
47 |
$(use_enable mpi) |
48 |
) |
49 |
elif [[ $x == double ]]; then |
50 |
|
51 |
|
52 |
|
53 |
1.122 sci-libs/fftw/ChangeLog |
54 |
|
55 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.122&view=markup |
56 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.122&content-type=text/plain |
57 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?r1=1.121&r2=1.122 |
58 |
|
59 |
Index: ChangeLog |
60 |
=================================================================== |
61 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v |
62 |
retrieving revision 1.121 |
63 |
retrieving revision 1.122 |
64 |
diff -u -r1.121 -r1.122 |
65 |
--- ChangeLog 4 Feb 2012 21:45:07 -0000 1.121 |
66 |
+++ ChangeLog 5 Feb 2012 20:39:36 -0000 1.122 |
67 |
@@ -1,6 +1,12 @@ |
68 |
# ChangeLog for sci-libs/fftw |
69 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
70 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.121 2012/02/04 21:45:07 ottxor Exp $ |
71 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.122 2012/02/05 20:39:36 ottxor Exp $ |
72 |
+ |
73 |
+*fftw-3.2.2-r2 (05 Feb 2012) |
74 |
+ |
75 |
+ 05 Feb 2012; Christoph Junghans <ottxor@g.o> +fftw-3.2.2-r2.ebuild, |
76 |
+ fftw-3.3-r2.ebuild: |
77 |
+ paired-single is only supported in fftw-3.2.* |
78 |
|
79 |
*fftw-3.3-r2 (04 Feb 2012) |
80 |
|
81 |
|
82 |
|
83 |
|
84 |
1.1 sci-libs/fftw/fftw-3.2.2-r2.ebuild |
85 |
|
86 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.2.2-r2.ebuild?rev=1.1&view=markup |
87 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.2.2-r2.ebuild?rev=1.1&content-type=text/plain |
88 |
|
89 |
Index: fftw-3.2.2-r2.ebuild |
90 |
=================================================================== |
91 |
# Copyright 1999-2012 Gentoo Foundation |
92 |
# Distributed under the terms of the GNU General Public License v2 |
93 |
# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2-r2.ebuild,v 1.1 2012/02/05 20:39:36 ottxor Exp $ |
94 |
|
95 |
EAPI=2 |
96 |
|
97 |
inherit autotools eutils flag-o-matic fortran-2 toolchain-funcs |
98 |
|
99 |
DESCRIPTION="Fast C library for the Discrete Fourier Transform" |
100 |
HOMEPAGE="http://www.fftw.org/" |
101 |
SRC_URI="http://www.fftw.org/${P}.tar.gz" |
102 |
|
103 |
LICENSE="GPL-2" |
104 |
SLOT="3.0" |
105 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
106 |
IUSE="altivec doc fortran openmp paired-single sse sse2 threads zbus" |
107 |
|
108 |
DEPEND="fortran? ( virtual/fortran )" |
109 |
RDEPEND="${DEPEND}" |
110 |
|
111 |
pkg_setup() { |
112 |
use openmp && FORTRAN_NEED_OPENMP="1" |
113 |
use fortran && fortran-2_pkg_setup |
114 |
FFTW_THREADS="--disable-threads --disable-openmp" |
115 |
if use openmp; then |
116 |
FFTW_THREADS="--disable-threads --enable-openmp" |
117 |
elif use threads; then |
118 |
FFTW_THREADS="--enable-threads --disable-openmp" |
119 |
fi |
120 |
if use openmp && ! tc-has-openmp; then |
121 |
ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " |
122 |
ewarn "If you want to build fftw with OpenMP, abort now," |
123 |
ewarn "and switch CC to an OpenMP capable compiler" |
124 |
ewarn "Otherwise, we will build using POSIX threads." |
125 |
epause 5 |
126 |
FFTW_THREADS="--enable-threads --disable-openmp" |
127 |
fi |
128 |
FFTW_DIRS="single double longdouble" |
129 |
use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed) |
130 |
} |
131 |
|
132 |
src_prepare() { |
133 |
use threads && epatch "${FILESDIR}"/${P}-pc-threads.patch |
134 |
epatch "${FILESDIR}"/${PN}-3.2.1-as-needed.patch |
135 |
|
136 |
# fix info file for category directory |
137 |
sed -i \ |
138 |
-e 's/Texinfo documentation system/Libraries/' \ |
139 |
doc/fftw3.info || die "failed to fix info file" |
140 |
|
141 |
rm m4/lt* m4/libtool.m4 |
142 |
|
143 |
AT_M4DIR=m4 eautoreconf |
144 |
for x in ${FFTW_DIRS}; do |
145 |
mkdir "${S}-${x}" || die |
146 |
done |
147 |
} |
148 |
|
149 |
src_configure() { |
150 |
# filter -Os according to docs |
151 |
replace-flags -Os -O2 |
152 |
|
153 |
local myconfcommon="--enable-shared |
154 |
$(use_enable fortran) |
155 |
$(use_enable zbus mips-zbus-timer) |
156 |
${FFTW_THREADS}" |
157 |
|
158 |
local myconfsingle="${myconfcommon} --enable-single" |
159 |
local myconfdouble="${myconfcommon}" |
160 |
local myconflongdouble="${myconfcommon} --enable-long-double" |
161 |
if use sse2; then |
162 |
myconfsingle="${myconfsingle} --enable-sse" |
163 |
myconfdouble="${myconfdouble} --enable-sse2" |
164 |
elif use sse; then |
165 |
myconfsingle="${myconfsingle} --enable-sse" |
166 |
fi |
167 |
# altivec only helps singles, not doubles |
168 |
if use altivec; then |
169 |
myconfsingle="${myconfsingle} --enable-altivec" |
170 |
fi |
171 |
if use paired-single; then |
172 |
myconfsingle="${myconfsingle} --enable-mips-ps" |
173 |
fi |
174 |
|
175 |
for x in ${FFTW_DIRS}; do |
176 |
cd "${S}-${x}" |
177 |
einfo "Configuring for ${x} precision" |
178 |
local p=myconf${x} |
179 |
ECONF_SOURCE="${S}" econf ${!p} |
180 |
done |
181 |
} |
182 |
|
183 |
src_compile() { |
184 |
for x in ${FFTW_DIRS}; do |
185 |
cd "${S}-${x}" |
186 |
einfo "Compiling for ${x} precision" |
187 |
emake || die "emake for ${x} precision failed" |
188 |
done |
189 |
} |
190 |
|
191 |
src_test () { |
192 |
# We want this to be a reasonably quick test, but that is still hard... |
193 |
ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine" |
194 |
# Do not increase the number of threads, it will not help your performance |
195 |
#local testbase="perl check.pl --nthreads=1 --estimate" |
196 |
# ${testbase} -${p}d || die "Failure: $n" |
197 |
for x in ${FFTW_DIRS}; do |
198 |
cd "${S}-${x}/tests" |
199 |
einfo "Testing ${x} precision" |
200 |
emake -j1 check || die "emake test ${x} failed" |
201 |
done |
202 |
} |
203 |
|
204 |
src_install () { |
205 |
# all builds are installed in the same place |
206 |
# libs have distinuguished names; include files, docs etc. identical. |
207 |
for x in ${FFTW_DIRS}; do |
208 |
cd "${S}-${x}" |
209 |
emake DESTDIR="${D}" install || die "emake install for ${x} failed" |
210 |
done |
211 |
|
212 |
cd "${S}" |
213 |
dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS |
214 |
if use doc; then |
215 |
cd doc |
216 |
insinto /usr/share/doc/${PF} |
217 |
doins -r html fftw3.pdf || die "doc install failed" |
218 |
insinto /usr/share/doc/${PF}/faq |
219 |
doins FAQ/fftw-faq.html/* |
220 |
fi |
221 |
} |