From cc4618c9ba3d974948ebf340b542d8cb01db2f55 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Sep 2021 22:05:01 +0100 Subject: gentoo resync : 16.09.2021 --- sci-libs/fftw/Manifest | 8 +- sci-libs/fftw/fftw-3.3.10.ebuild | 163 +++++++++++++++++++++++++++++++++++++++ sci-libs/fftw/fftw-3.3.9.ebuild | 4 +- sci-libs/fftw/fftw-9999.ebuild | 31 ++++---- sci-libs/fftw/metadata.xml | 2 +- 5 files changed, 188 insertions(+), 20 deletions(-) create mode 100644 sci-libs/fftw/fftw-3.3.10.ebuild (limited to 'sci-libs/fftw') diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest index 9b31d94d1c60..0ba5df49b664 100644 --- a/sci-libs/fftw/Manifest +++ b/sci-libs/fftw/Manifest @@ -1,4 +1,6 @@ +DIST fftw-3.3.10.tar.gz 4144100 BLAKE2B 3663872bd95a01d2c79af185f53918e1d1a9c91c620082402772c07f25b9b77d4920a78dc686fac6b51aa961b8d62b7e2cef3f3031e096bed40ced80b59b29d5 SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf -EBUILD fftw-3.3.9.ebuild 4143 BLAKE2B 5ad7571dc1863e48762379899615f96cd81317ce8f79e37117c47b099ab1f38bc62a74f0bf8fb4834ddbf8866d8ef6fcb06f0764e974d55b90d73d11d401b44f SHA512 6aa8926f33b7246cbef3ac579ab893def414e79d0e8fd519e1f26df8d7e07d9c64e8f083961191cc1b6e171dbb3c9d97be6cdcc597d73d282434c7597ee5e29f -EBUILD fftw-9999.ebuild 4062 BLAKE2B 2cdb80fdc4d24ea3af6ec1ffc2b73450c76e735130d22e8e01cb479d3c24b5f2bd4926a947a937340988447863bf7d1b222702a337139f5fc1e437556f7f5137 SHA512 0e44b6d0f2262ec0978ab00b909f0b2d6b4c92e0a6a5cc10e9e3317d2b9c7e1d4654315f618ed18f46aa68eeaaadfff29a7a38ef8a71c52435a1012307bbbe47 -MISC metadata.xml 959 BLAKE2B 91fa1956cbe25068165585a0e09bdf8e6c75c30a80ea27df46b99c9336ecdf1db13c49b62ea111a70eb2b5a456386ae745a77f28cf616858c8dbb4015f26735a SHA512 b3e3b65573de896dc2a5e3481a885dd172e3422858d9f967758dc9663d84e5809116aa41371e704d65173c400c03240798cea892e7ce5d211547d6db0a7f493e +EBUILD fftw-3.3.10.ebuild 4151 BLAKE2B ec5be9939e0cb050e7c9eceddcd3be9096b5b85a1ec03ba07b48635c6acfd2cfb96fb5f2b2f2d897871a7b2bc14777144cf2745347529dc6005f60e80cf83255 SHA512 442f7b57e59b9aae7d626bacff92a79406c56f95f3ecc35037a30a5c7f109a8e304667ef8abd2b3d3511e0634c9e549b7932a9b4b9dcdb72df9f8e8013d7b81c +EBUILD fftw-3.3.9.ebuild 4145 BLAKE2B 0dd89a7a96ecb4209b9e45b11300b8b66b92c9123ae02965c243c6b07ed624e1ae836a9e673d331bc753a6b2309e93d8aa058b3a0d3f28d03aac8a6d52e19814 SHA512 4e668945d603046a785674dad1968bdb2b9d8369a5fd6c69af553cb02656ebc1237b3e96f287123df8a1ccd0612645db8610911b404a880af61493f8ac15375d +EBUILD fftw-9999.ebuild 4151 BLAKE2B ec5be9939e0cb050e7c9eceddcd3be9096b5b85a1ec03ba07b48635c6acfd2cfb96fb5f2b2f2d897871a7b2bc14777144cf2745347529dc6005f60e80cf83255 SHA512 442f7b57e59b9aae7d626bacff92a79406c56f95f3ecc35037a30a5c7f109a8e304667ef8abd2b3d3511e0634c9e549b7932a9b4b9dcdb72df9f8e8013d7b81c +MISC metadata.xml 960 BLAKE2B f9bd9e8190241bb5c757b521fc7c0d9adb608d3f616f4bd32c7fdba895a464e49c6eb3080d849c70ece5993f2999eaa22b08033954b60c33834ea1af8b646df7 SHA512 21ffca8724d5e4a73d9545bd1a73dad15d1341cc15a5340172315d1ace97cf5fda30973685890b7b18255feeb67f80317fde1b9d951c4f114b1d5e45a1587a7c diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild new file mode 100644 index 000000000000..c8a32cdc88e8 --- /dev/null +++ b/sci-libs/fftw/fftw-3.3.10.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +FORTRAN_NEEDED=fortran + +inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs + +DESCRIPTION="Fast C library for the Discrete Fourier Transform" +HOMEPAGE="https://www.fftw.org/" + +MY_P=${PN}-${PV/_p/-pl} + +if [[ ${PV} == *9999 ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/FFTW/fftw3.git" +else + SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi + +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2+" +SLOT="3.0/3" +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 test threads zbus" +RESTRICT="!test? ( test )" + +RDEPEND="mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-lang/perl )" + +HTML_DOCS=( doc/html/. ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]] && use openmp; then + tc-check-openmp + FORTRAN_NEED_OPENMP=1 + fi + + fortran-2_pkg_setup + MULTIBUILD_VARIANTS=( single double longdouble ) +} + +src_prepare() { + default + + # fix info file for category directory + [[ ${PV} == *9999 ]] && eautoreconf +} + +multilib_src_configure() { + local myconf=( + --enable-shared + --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 ) + + # --enable-quad-precision is a brittle feature that requires + # __float128 support from the toolchain, which is lacking on + # most niche architectures. Bug #770346 + case "${MULTIBUILD_ID}" in + single-*) + # altivec, sse, single-paired only work for single + myconf+=( + --enable-single + $(use_enable cpu_flags_ppc_altivec altivec) + $(use_enable cpu_flags_x86_avx avx) + $(use_enable cpu_flags_x86_avx2 avx2) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable cpu_flags_x86_sse2 sse2) + $(use_enable cpu_flags_arm_neon neon) + $(use_enable mpi) + ) + ;; + + double-*) + myconf+=( + $(use_enable cpu_flags_x86_avx avx) + $(use_enable cpu_flags_x86_avx2 avx2) + $(use_enable cpu_flags_x86_sse2 sse2) + $(use_enable mpi) + ) + ;; + + longdouble-*) + myconf+=( + --enable-long-double + $(use_enable mpi) + ) + ;; + + *) + die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild" + ;; + esac + + ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)" +} + +src_configure() { + # upstream does not append proper -m flags + # https://bugs.gentoo.org/698572 + use cpu_flags_x86_avx2 && append-flags -mavx2 + + multibuild_foreach_variant multilib-minimal_src_configure +} + +src_compile() { + multibuild_foreach_variant multilib-minimal_src_compile +} + +multilib_src_test() { + emake -C tests smallcheck +} + +src_test() { + # We want this to be a reasonably quick test, but that is still hard... + ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine" + # Do not increase the number of threads, it will not help your performance + # local testbase="perl check.pl --nthreads=1 --estimate" + # ${testbase} -${p}d || die "Failure: $n" + + multibuild_foreach_variant multilib-minimal_src_test +} + +src_install() { + multibuild_foreach_variant multilib-minimal_src_install + dodoc CONVENTIONS + + if use doc; then + dodoc doc/*.pdf + docinto faq + dodoc -r doc/FAQ/fftw-faq.html/. + else + rm -r "${ED}"/usr/share/doc/${PF}/html || die + fi + + augment_pc_files() { + local x + for x in "${ED}"/usr/$(get_libdir)/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 + done + done + } + multilib_foreach_abi augment_pc_files + + # fftw uses pkg-config to record its private dependencies + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild index cbd8e2451a7e..e377ed60541c 100644 --- a/sci-libs/fftw/fftw-3.3.9.ebuild +++ b/sci-libs/fftw/fftw-3.3.9.ebuild @@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs DESCRIPTION="Fast C library for the Discrete Fourier Transform" -HOMEPAGE="http://www.fftw.org/" +HOMEPAGE="https://www.fftw.org/" MY_P=${PN}-${PV/_p/-pl} @@ -16,7 +16,7 @@ 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" + SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild index 23c52fd7f3d2..c8a32cdc88e8 100644 --- a/sci-libs/fftw/fftw-9999.ebuild +++ b/sci-libs/fftw/fftw-9999.ebuild @@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs DESCRIPTION="Fast C library for the Discrete Fourier Transform" -HOMEPAGE="http://www.fftw.org/" +HOMEPAGE="https://www.fftw.org/" MY_P=${PN}-${PV/_p/-pl} @@ -16,22 +16,21 @@ 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-2+" SLOT="3.0/3" 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 test threads zbus" RESTRICT="!test? ( test )" -RDEPEND=" - mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )" +RDEPEND="mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=" - test? ( dev-lang/perl )" +BDEPEND="test? ( dev-lang/perl )" -S="${WORKDIR}/${MY_P}" HTML_DOCS=( doc/html/. ) pkg_pretend() { @@ -65,6 +64,7 @@ multilib_src_configure() { $(use_enable threads) $(use_enable openmp) ) + [[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode ) # --enable-quad-precision is a brittle feature that requires @@ -147,13 +147,16 @@ src_install() { rm -r "${ED}"/usr/share/doc/${PF}/html || die fi - local x - 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 + augment_pc_files() { + local x + for x in "${ED}"/usr/$(get_libdir)/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 + done done - done + } + multilib_foreach_abi augment_pc_files # fftw uses pkg-config to record its private dependencies find "${ED}" -name '*.la' -delete || die diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml index bf126e2d0802..1a94d1573c47 100644 --- a/sci-libs/fftw/metadata.xml +++ b/sci-libs/fftw/metadata.xml @@ -1,5 +1,5 @@ - + sci@gentoo.org -- cgit v1.2.3