From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/
Date: Mon, 14 Dec 2020 21:04:36 +0000 (UTC) [thread overview]
Message-ID: <1607979851.9ff0405de628c9a266896b1d562af904d3099b27.soap@gentoo> (raw)
commit: 9ff0405de628c9a266896b1d562af904d3099b27
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 14 21:04:11 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 21:04:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff0405d
sci-libs/fftw: Sync live ebuild
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/fftw/fftw-9999.ebuild | 33 +++++++++++++++------------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index d92ed1ac2ad..3d5b307ce05 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
FORTRAN_NEEDED=fortran
@@ -12,26 +12,27 @@ HOMEPAGE="http://www.fftw.org/"
MY_P=${PN}-${PV/_p/-pl}
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
else
SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
fi
LICENSE="GPL-2+"
SLOT="3.0/3"
-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"
+IUSE="cpu_flags_arm_neon 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 openmp quad test threads zbus"
RESTRICT="!test? ( test )"
RDEPEND="
mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
quad? ( sys-devel/gcc[fortran] )
test? ( dev-lang/perl )"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
HTML_DOCS=( doc/html/. )
pkg_pretend() {
@@ -60,13 +61,7 @@ src_prepare() {
default
# fix info file for category directory
- if [[ ${PV} = *9999 ]]; then
- sed -i -e
- 's/Texinfo documentation system/Libraries/' \
- doc/fftw3."info" || die "failed to fix info file"
-
- eautoreconf
- fi
+ [[ ${PV} == *9999 ]] && eautoreconf
}
multilib_src_configure() {
@@ -82,13 +77,15 @@ multilib_src_configure() {
local myconf=(
--enable-shared
- $(use_enable static-libs static)
+ --disable-static
$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
$(use_enable fortran)
$(use_enable zbus mips-zbus-timer)
$(use_enable threads)
$(use_enable openmp)
)
+ [[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
+
case "${MULTIBUILD_ID}" in
single-*)
# altivec, sse, single-paired only work for single
@@ -99,7 +96,7 @@ multilib_src_configure() {
$(use_enable cpu_flags_x86_avx2 avx2)
$(use_enable cpu_flags_x86_sse sse)
$(use_enable cpu_flags_x86_sse2 sse2)
- $(use_enable neon)
+ $(use_enable cpu_flags_arm_neon neon)
$(use_enable mpi)
)
;;
@@ -166,11 +163,11 @@ src_install() {
docinto faq
dodoc -r doc/FAQ/fftw-faq.html/.
else
- rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
+ rm -r "${ED}"/usr/share/doc/${PF}/html || die
fi
local x
- for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
+ for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
local u
for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
@@ -178,5 +175,5 @@ src_install() {
done
# fftw uses pkg-config to record its private dependencies
- find "${D}" -name '*.la' -delete || die
+ find "${ED}" -name '*.la' -delete || die
}
next reply other threads:[~2020-12-14 21:04 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 21:04 David Seifert [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-09 14:36 [gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/ Sam James
2025-04-26 15:30 Arthur Zamarin
2025-04-26 14:39 Sam James
2025-04-26 10:06 Arthur Zamarin
2025-04-26 5:55 Sam James
2025-04-26 5:48 Sam James
2024-07-15 8:01 Eli Schwartz
2024-07-15 8:01 Eli Schwartz
2022-05-17 12:48 WANG Xuerui
2022-01-09 10:42 David Seifert
2022-01-01 11:52 James Le Cuirot
2021-12-14 22:16 Sam James
2021-12-07 6:26 Agostino Sarubbo
2021-12-06 7:15 Jakov Smolić
2021-12-05 22:30 Sam James
2021-12-05 22:05 Sam James
2021-12-05 22:05 Sam James
2021-12-05 18:33 Sam James
2021-12-05 18:21 Arthur Zamarin
2021-11-05 11:59 David Seifert
2021-11-05 11:59 David Seifert
2021-09-16 1:45 Sam James
2021-06-08 2:29 Yixun Lan
2021-03-30 18:18 Sam James
2021-03-30 18:18 Sam James
2021-02-25 3:22 Sam James
2021-02-25 3:22 Sam James
2021-02-25 2:50 Sam James
2021-02-18 20:11 Sergei Trofimovich
2021-02-14 19:54 Sam James
2021-02-14 14:53 Sam James
2021-02-13 20:47 Sergei Trofimovich
2021-02-13 18:50 David Seifert
2021-02-13 18:30 David Seifert
2021-02-12 9:57 Sam James
2021-02-11 7:55 Sam James
2021-02-11 7:54 Sam James
2021-01-06 15:17 Fabian Groffen
2020-12-14 21:04 David Seifert
2020-12-13 10:34 Sam James
2020-10-04 13:23 David Seifert
2020-08-05 14:01 Agostino Sarubbo
2020-08-01 9:01 Sergei Trofimovich
2020-08-01 8:53 Sergei Trofimovich
2020-07-27 18:36 Sergei Trofimovich
2020-07-25 21:50 Sam James
2020-07-25 8:42 Sergei Trofimovich
2020-07-24 15:09 Agostino Sarubbo
2020-06-10 4:41 Georgy Yakovlev
2020-05-13 9:03 Michał Górny
2020-03-29 16:57 Christoph Junghans
2020-03-25 5:24 Georgy Yakovlev
2019-05-05 19:05 Mike Gilbert
2019-04-14 14:37 Aaron Bauman
2018-09-01 22:23 Andrew Savchenko
2018-01-13 2:54 Christoph Junghans
2018-01-11 6:52 Christoph Junghans
2018-01-01 20:47 Christoph Junghans
2017-12-24 8:49 Markus Meier
2017-10-29 23:20 David Seifert
2017-10-19 5:00 Markus Meier
2017-09-25 9:26 Sergei Trofimovich
2017-09-23 14:32 Thomas Deutschmann
2017-09-23 13:46 Sergei Trofimovich
2017-09-23 13:05 Sergei Trofimovich
2017-09-23 12:40 Sergei Trofimovich
2017-09-23 12:04 Tobias Klausmann
2017-09-23 11:09 Tobias Klausmann
2017-09-23 10:39 Sergei Trofimovich
2017-06-16 11:24 Alexis Ballier
2017-05-26 18:02 David Seifert
2017-03-17 6:36 Matt Turner
2017-02-14 8:00 David Seifert
2017-01-20 9:06 Jeroen Roovers
2017-01-20 8:58 Jeroen Roovers
2017-01-08 18:20 Markus Meier
2017-01-07 2:23 Aaron Bauman
2016-11-24 9:50 Tobias Klausmann
2016-11-22 19:35 David Seifert
2016-08-29 21:22 Christoph Junghans
2016-08-25 10:48 David Seifert
2016-08-11 7:55 David Seifert
2016-08-09 16:47 Christoph Junghans
2016-08-02 15:19 David Seifert
2016-08-01 20:41 Christoph Junghans
2016-08-01 20:37 Christoph Junghans
2016-07-22 0:22 Lars Wendler
2016-07-20 23:57 Christoph Junghans
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1607979851.9ff0405de628c9a266896b1d562af904d3099b27.soap@gentoo \
--to=soap@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox