Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Christoph Junghans <junghans@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/
Date: Sun, 29 Mar 2020 16:57:42
Message-Id: 1585501048.67a3fff18cedaf357e1a8cff0eae5f8aaf4824eb.junghans@gentoo
1 commit: 67a3fff18cedaf357e1a8cff0eae5f8aaf4824eb
2 Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 29 16:57:10 2020 +0000
4 Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 29 16:57:28 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a3fff1
7
8 sci-libs/fftw: fix build with mpich
9
10 Closes: https://bugs.gentoo.org/699650
11 Package-Manager: Portage-2.3.89, Repoman-2.3.20
12 Signed-off-by: Christoph Junghans <junghans <AT> gentoo.org>
13
14 .../{fftw-9999.ebuild => fftw-3.3.8-r1.ebuild} | 34 +++++++++-------------
15 sci-libs/fftw/fftw-9999.ebuild | 34 +++++++++-------------
16 2 files changed, 28 insertions(+), 40 deletions(-)
17
18 diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
19 similarity index 78%
20 copy from sci-libs/fftw/fftw-9999.ebuild
21 copy to sci-libs/fftw/fftw-3.3.8-r1.ebuild
22 index 718aed13b25..9266b28d174 100644
23 --- a/sci-libs/fftw/fftw-9999.ebuild
24 +++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
25 @@ -5,7 +5,7 @@ EAPI=6
26
27 FORTRAN_NEEDED=fortran
28
29 -inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
30 +inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
31
32 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
33 HOMEPAGE="http://www.fftw.org/"
34 @@ -17,25 +17,22 @@ if [[ ${PV} = *9999 ]]; then
35 EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
36 else
37 SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
38 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
39 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
40 fi
41
42 LICENSE="GPL-2+"
43 SLOT="3.0/3"
44 -IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
45 +IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
46 RESTRICT="!test? ( test )"
47
48 RDEPEND="
49 mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
50 DEPEND="${RDEPEND}
51 + quad? ( sys-devel/gcc[fortran] )
52 test? ( dev-lang/perl )"
53 -if [[ ${PV} = *9999 ]]; then
54 - DEPEND="${DEPEND}
55 - dev-ml/ocamlbuild
56 - doc? ( media-gfx/transfig )"
57 -fi
58
59 S=${WORKDIR}/${MY_P}
60 +HTML_DOCS=( doc/html/. )
61
62 pkg_pretend() {
63 [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
64 @@ -64,6 +61,10 @@ src_prepare() {
65
66 # fix info file for category directory
67 if [[ ${PV} = *9999 ]]; then
68 + sed -i -e
69 + 's/Texinfo documentation system/Libraries/' \
70 + doc/fftw3."info" || die "failed to fix info file"
71 +
72 eautoreconf
73 fi
74 }
75 @@ -81,7 +82,6 @@ multilib_src_configure() {
76
77 local myconf=(
78 --enable-shared
79 - $([[ ${PV} = *9999 ]] && echo "--enable-maintainer-mode")
80 $(use_enable static-libs static)
81 $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
82 $(use_enable fortran)
83 @@ -94,7 +94,7 @@ multilib_src_configure() {
84 # altivec, sse, single-paired only work for single
85 myconf+=(
86 --enable-single
87 - $(use_enable cpu_flags_ppc_altivec altivec)
88 + $(use_enable altivec)
89 $(use_enable cpu_flags_x86_avx avx)
90 $(use_enable cpu_flags_x86_avx2 avx2)
91 $(use_enable cpu_flags_x86_sse sse)
92 @@ -132,14 +132,7 @@ multilib_src_configure() {
93 ;;
94 esac
95
96 - local MY_S="${S}"
97 - #out-of-source build is broken for 9999 due to maintainer mode
98 - if [[ ${PV} = *9999 ]]; then
99 - cp -al "${S}"/* "${BUILD_DIR}"/
100 - MY_S="${BUILD_DIR}"
101 - fi
102 -
103 - ECONF_SOURCE="${MY_S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
104 + ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)"
105 }
106
107 src_configure() {
108 @@ -147,7 +140,7 @@ src_configure() {
109 }
110
111 src_compile() {
112 - multibuild_foreach_variant multilib-minimal_src_compile all $([[ ${PV} = *9999 ]] && usev doc)
113 + multibuild_foreach_variant multilib-minimal_src_compile
114 }
115
116 multilib_src_test() {
117 @@ -165,7 +158,6 @@ src_test() {
118 }
119
120 src_install() {
121 - use doc && HTML_DOCS=( doc/html/. )
122 multibuild_foreach_variant multilib-minimal_src_install
123 dodoc CONVENTIONS
124
125 @@ -173,6 +165,8 @@ src_install() {
126 dodoc doc/*.pdf
127 docinto faq
128 dodoc -r doc/FAQ/fftw-faq.html/.
129 + else
130 + rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
131 fi
132
133 local x
134
135 diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
136 index 718aed13b25..9266b28d174 100644
137 --- a/sci-libs/fftw/fftw-9999.ebuild
138 +++ b/sci-libs/fftw/fftw-9999.ebuild
139 @@ -5,7 +5,7 @@ EAPI=6
140
141 FORTRAN_NEEDED=fortran
142
143 -inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
144 +inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
145
146 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
147 HOMEPAGE="http://www.fftw.org/"
148 @@ -17,25 +17,22 @@ if [[ ${PV} = *9999 ]]; then
149 EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
150 else
151 SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
152 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
153 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
154 fi
155
156 LICENSE="GPL-2+"
157 SLOT="3.0/3"
158 -IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
159 +IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
160 RESTRICT="!test? ( test )"
161
162 RDEPEND="
163 mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
164 DEPEND="${RDEPEND}
165 + quad? ( sys-devel/gcc[fortran] )
166 test? ( dev-lang/perl )"
167 -if [[ ${PV} = *9999 ]]; then
168 - DEPEND="${DEPEND}
169 - dev-ml/ocamlbuild
170 - doc? ( media-gfx/transfig )"
171 -fi
172
173 S=${WORKDIR}/${MY_P}
174 +HTML_DOCS=( doc/html/. )
175
176 pkg_pretend() {
177 [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
178 @@ -64,6 +61,10 @@ src_prepare() {
179
180 # fix info file for category directory
181 if [[ ${PV} = *9999 ]]; then
182 + sed -i -e
183 + 's/Texinfo documentation system/Libraries/' \
184 + doc/fftw3."info" || die "failed to fix info file"
185 +
186 eautoreconf
187 fi
188 }
189 @@ -81,7 +82,6 @@ multilib_src_configure() {
190
191 local myconf=(
192 --enable-shared
193 - $([[ ${PV} = *9999 ]] && echo "--enable-maintainer-mode")
194 $(use_enable static-libs static)
195 $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
196 $(use_enable fortran)
197 @@ -94,7 +94,7 @@ multilib_src_configure() {
198 # altivec, sse, single-paired only work for single
199 myconf+=(
200 --enable-single
201 - $(use_enable cpu_flags_ppc_altivec altivec)
202 + $(use_enable altivec)
203 $(use_enable cpu_flags_x86_avx avx)
204 $(use_enable cpu_flags_x86_avx2 avx2)
205 $(use_enable cpu_flags_x86_sse sse)
206 @@ -132,14 +132,7 @@ multilib_src_configure() {
207 ;;
208 esac
209
210 - local MY_S="${S}"
211 - #out-of-source build is broken for 9999 due to maintainer mode
212 - if [[ ${PV} = *9999 ]]; then
213 - cp -al "${S}"/* "${BUILD_DIR}"/
214 - MY_S="${BUILD_DIR}"
215 - fi
216 -
217 - ECONF_SOURCE="${MY_S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
218 + ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)"
219 }
220
221 src_configure() {
222 @@ -147,7 +140,7 @@ src_configure() {
223 }
224
225 src_compile() {
226 - multibuild_foreach_variant multilib-minimal_src_compile all $([[ ${PV} = *9999 ]] && usev doc)
227 + multibuild_foreach_variant multilib-minimal_src_compile
228 }
229
230 multilib_src_test() {
231 @@ -165,7 +158,6 @@ src_test() {
232 }
233
234 src_install() {
235 - use doc && HTML_DOCS=( doc/html/. )
236 multibuild_foreach_variant multilib-minimal_src_install
237 dodoc CONVENTIONS
238
239 @@ -173,6 +165,8 @@ src_install() {
240 dodoc doc/*.pdf
241 docinto faq
242 dodoc -r doc/FAQ/fftw-faq.html/.
243 + else
244 + rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
245 fi
246
247 local x
Report Message
Find on MARC Find on Google Groups