1 |
jlec 10/04/01 19:09:20 |
2 |
|
3 |
Modified: ChangeLog fftw-2.1.5-r5.ebuild |
4 |
Added: fftw-2.1.5-r6.ebuild |
5 |
Log: |
6 |
Fixed the prefix support for Slot:2 |
7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.100 sci-libs/fftw/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.100&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.100&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/ChangeLog?r1=1.99&r2=1.100 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v |
19 |
retrieving revision 1.99 |
20 |
retrieving revision 1.100 |
21 |
diff -u -r1.99 -r1.100 |
22 |
--- ChangeLog 28 Mar 2010 18:30:48 -0000 1.99 |
23 |
+++ ChangeLog 1 Apr 2010 19:09:20 -0000 1.100 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for sci-libs/fftw |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.99 2010/03/28 18:30:48 jlec Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.100 2010/04/01 19:09:20 jlec Exp $ |
29 |
+ |
30 |
+*fftw-2.1.5-r6 (01 Apr 2010) |
31 |
+ |
32 |
+ 01 Apr 2010; Justin Lecher <jlec@g.o> fftw-2.1.5-r5.ebuild, |
33 |
+ +fftw-2.1.5-r6.ebuild: |
34 |
+ Fixed the prefix support for Slot:2 |
35 |
|
36 |
28 Mar 2010; Justin Lecher <justin@g.o> fftw-2.1.5-r5.ebuild: |
37 |
Keyworded for ~amd64-linux |
38 |
|
39 |
|
40 |
|
41 |
1.16 sci-libs/fftw/fftw-2.1.5-r5.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r5.ebuild?rev=1.16&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r5.ebuild?rev=1.16&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r5.ebuild?r1=1.15&r2=1.16 |
46 |
|
47 |
Index: fftw-2.1.5-r5.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r5.ebuild,v |
50 |
retrieving revision 1.15 |
51 |
retrieving revision 1.16 |
52 |
diff -u -r1.15 -r1.16 |
53 |
--- fftw-2.1.5-r5.ebuild 28 Mar 2010 18:30:48 -0000 1.15 |
54 |
+++ fftw-2.1.5-r5.ebuild 1 Apr 2010 19:09:20 -0000 1.16 |
55 |
@@ -1,6 +1,6 @@ |
56 |
# Copyright 1999-2010 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r5.ebuild,v 1.15 2010/03/28 18:30:48 jlec Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r5.ebuild,v 1.16 2010/04/01 19:09:20 jlec Exp $ |
60 |
|
61 |
inherit eutils flag-o-matic autotools toolchain-funcs |
62 |
|
63 |
@@ -15,7 +15,7 @@ |
64 |
LICENSE="GPL-2" |
65 |
IUSE="doc float fortran mpi openmp threads" |
66 |
|
67 |
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" |
68 |
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86" |
69 |
|
70 |
pkg_setup() { |
71 |
# this one is reported to cause trouble on pentium4 m series |
72 |
|
73 |
|
74 |
|
75 |
1.1 sci-libs/fftw/fftw-2.1.5-r6.ebuild |
76 |
|
77 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r6.ebuild?rev=1.1&view=markup |
78 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r6.ebuild?rev=1.1&content-type=text/plain |
79 |
|
80 |
Index: fftw-2.1.5-r6.ebuild |
81 |
=================================================================== |
82 |
# Copyright 1999-2010 Gentoo Foundation |
83 |
# Distributed under the terms of the GNU General Public License v2 |
84 |
# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r6.ebuild,v 1.1 2010/04/01 19:09:20 jlec Exp $ |
85 |
|
86 |
EAPI="3" |
87 |
|
88 |
inherit autotools eutils flag-o-matic toolchain-funcs |
89 |
|
90 |
DESCRIPTION="Fast C library for the Discrete Fourier Transform" |
91 |
SRC_URI="http://www.fftw.org/${P}.tar.gz" |
92 |
HOMEPAGE="http://www.fftw.org" |
93 |
|
94 |
DEPEND="mpi? ( virtual/mpi )" |
95 |
RDEPEND="${DEPEND}" |
96 |
|
97 |
SLOT="2.1" |
98 |
LICENSE="GPL-2" |
99 |
IUSE="doc float fortran mpi openmp threads" |
100 |
|
101 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
102 |
|
103 |
pkg_setup() { |
104 |
# this one is reported to cause trouble on pentium4 m series |
105 |
filter-mfpmath "sse" |
106 |
|
107 |
# here I need (surprise) to increase optimization: |
108 |
# --enable-i386-hacks requires -fomit-frame-pointer to work properly |
109 |
if use x86; then |
110 |
is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer" |
111 |
fi |
112 |
if use openmp && |
113 |
[[ $(tc-getCC)$ == *gcc* ]] && |
114 |
( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || |
115 |
! built_with_use sys-devel/gcc openmp ) |
116 |
then |
117 |
ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " |
118 |
ewarn "If you want to build fftw with OpenMP, abort now," |
119 |
ewarn "and switch CC to an OpenMP capable compiler" |
120 |
ewarn "Otherwise the configure script will select POSIX threads." |
121 |
epause 5 |
122 |
fi |
123 |
use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed) |
124 |
} |
125 |
|
126 |
src_prepare() { |
127 |
# doc suggests installing single and double precision versions |
128 |
# via separate compilations. will do in two separate source trees |
129 |
# since some sed'ing is done during the build |
130 |
# (?if --enable-type-prefix is set?) |
131 |
|
132 |
epatch "${FILESDIR}"/${P}-as-needed.patch |
133 |
epatch "${FILESDIR}"/${P}-configure.in.patch |
134 |
epatch "${FILESDIR}"/${P}-no-test.patch |
135 |
|
136 |
# fix info files |
137 |
for infofile in doc/fftw*info*; do |
138 |
cat >> ${infofile} <<-EOF |
139 |
INFO-DIR-SECTION Libraries |
140 |
START-INFO-DIR-ENTRY |
141 |
* fftw: (fftw). ${DESCRIPTION} |
142 |
END-INFO-DIR-ENTRY |
143 |
EOF |
144 |
done |
145 |
|
146 |
eautoreconf |
147 |
|
148 |
cd "${WORKDIR}" |
149 |
cp -R ${P} ${P}-double |
150 |
mv ${P} ${P}-single |
151 |
} |
152 |
|
153 |
src_configure() { |
154 |
local myconf=" |
155 |
--enable-shared |
156 |
--enable-type-prefix |
157 |
--enable-vec-recurse |
158 |
$(use_enable fortran) |
159 |
$(use_enable mpi) |
160 |
$(use_enable x86 i386-hacks)" |
161 |
if use openmp; then |
162 |
myconf="${myconf} |
163 |
--enable-threads |
164 |
--with-openmp" |
165 |
elif use threads; then |
166 |
myconf="${myconf} |
167 |
--enable-threads |
168 |
--without-openmp" |
169 |
else |
170 |
myconf="${myconf} |
171 |
--disable-threads |
172 |
--without-openmp" |
173 |
fi |
174 |
cd "${S}-single" |
175 |
econf ${myconf} --enable-float || die "econf for float failed" |
176 |
|
177 |
cd "${S}-double" |
178 |
econf ${myconf} || die "econf for double failed" |
179 |
} |
180 |
|
181 |
src_compile() { |
182 |
cd "${S}-single" |
183 |
emake || die "emake for float failed" |
184 |
|
185 |
cd "${S}-double" |
186 |
emake || die "emake for double failed" |
187 |
} |
188 |
|
189 |
src_test() { |
190 |
cd "${S}-single" |
191 |
emake -j1 check || die "emake check single failed" |
192 |
cd "${S}-double" |
193 |
emake -j1 check || die "emake check double failed" |
194 |
} |
195 |
|
196 |
src_install () { |
197 |
# both builds are installed in the same place |
198 |
# libs are distinguished by prefix (s or d), see docs for details |
199 |
|
200 |
cd "${S}-single" |
201 |
emake DESTDIR="${D}" install || die "emake install float failed" |
202 |
|
203 |
cd "${S}-double" |
204 |
emake DESTDIR="${D}" install || die "emake install double failed" |
205 |
|
206 |
insinto /usr/include |
207 |
doins fortran/fftw_f77.i || die "doins failed" |
208 |
dodoc AUTHORS ChangeLog NEWS TODO README README.hacks || die "dodoc failed" |
209 |
use doc && dohtml doc/* |
210 |
|
211 |
if use float; then |
212 |
for f in "${ED}"/usr/{include,$(get_libdir)}/*sfft*; do |
213 |
ln -s $(basename ${f}) ${f/sfft/fft} |
214 |
done |
215 |
for f in "${ED}"/usr/{include,$(get_libdir)}/*srfft*; do |
216 |
ln -s $(basename ${f}) ${f/srfft/rfft} |
217 |
done |
218 |
else |
219 |
for f in "${ED}"/usr/{include,$(get_libdir)}/*dfft*; do |
220 |
ln -s $(basename ${f}) ${f/dfft/fft} |
221 |
done |
222 |
for f in "${ED}"/usr/{include,$(get_libdir)}/*drfft*; do |
223 |
ln -s $(basename ${f}) ${f/drfft/rfft} |
224 |
done |
225 |
fi |
226 |
} |