commit: 28bb1835c7ffdd903a17279bfd2b9bdbc62047c8 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Mar 23 07:05:28 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Mar 23 07:06:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28bb1835
sci-libs/fftw: EAPI 8, backport fix to CMake config file * EAPI 8 * Backport fix/workaround to CMake config file which marks another file that is only available if fftw is configured/built with CMake as optional, so that consumers of the CMake config file don't immediately bail out. * Clean up src_test. It finishes in 10s or so for me per ABI/variant on an AMD Ryzen 3950X. I don't think the comment is useful anymore. If we're worried about slower machines, I think it's obvious for sci-*/* anyway. Closes: https://bugs.gentoo.org/913518 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{fftw-9999.ebuild => fftw-3.3.10-r1.ebuild} | 15 +++++++------ sci-libs/fftw/fftw-9999.ebuild | 11 ++++------ .../files/fftw-3.3.10-fixup-cmake-optional.patch | 25 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-3.3.10-r1.ebuild similarity index 91% copy from sci-libs/fftw/fftw-9999.ebuild copy to sci-libs/fftw/fftw-3.3.10-r1.ebuild index b7841feffe05..3d3387fcb597 100644 --- a/sci-libs/fftw/fftw-9999.ebuild +++ b/sci-libs/fftw/fftw-3.3.10-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 FORTRAN_NEEDED=fortran @@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi S="${WORKDIR}/${MY_P}" @@ -39,6 +39,10 @@ QA_CONFIG_IMPL_DECL_SKIP=( _rtc ) +PATCHES=( + "${FILESDIR}"/${PN}-3.3.10-fixup-cmake-optional.patch +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -132,12 +136,9 @@ multilib_src_test() { } 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" - + # ${testbase} -${p}d || die "Failure: ${n}" multibuild_foreach_variant multilib-minimal_src_test } diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild index b7841feffe05..3d87f75be718 100644 --- a/sci-libs/fftw/fftw-9999.ebuild +++ b/sci-libs/fftw/fftw-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 FORTRAN_NEEDED=fortran @@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi S="${WORKDIR}/${MY_P}" @@ -132,12 +132,9 @@ multilib_src_test() { } 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" - + # ${testbase} -${p}d || die "Failure: ${n}" multibuild_foreach_variant multilib-minimal_src_test } diff --git a/sci-libs/fftw/files/fftw-3.3.10-fixup-cmake-optional.patch b/sci-libs/fftw/files/fftw-3.3.10-fixup-cmake-optional.patch new file mode 100644 index 000000000000..ea09c4c9741a --- /dev/null +++ b/sci-libs/fftw/files/fftw-3.3.10-fixup-cmake-optional.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/913518 +https://github.com/FFTW/fftw3/issues/130 +https://github.com/FFTW/fftw3/pull/338 + +From f69fef7aa546d4477a2a3fd7f13fa8b2f6c54af7 Mon Sep 17 00:00:00 2001 +From: Tobias Mayer <[email protected]> +Date: Tue, 24 Oct 2023 13:46:33 +0200 +Subject: [PATCH] Fix the cmake config file when configured with autotools + +When the autotools based build is used the FFTW3ConfigDeps.cmake file is +not generated, so including it fails with an error. By making the +include optional, the config file can still be used in a limited +fashion. +--- a/FFTW3Config.cmake.in ++++ b/FFTW3Config.cmake.in +@@ -10,7 +10,7 @@ set (FFTW3@PREC_SUFFIX@_LIBRARIES fftw3@PREC_SUFFIX@) + set (FFTW3@PREC_SUFFIX@_LIBRARY_DIRS @CMAKE_INSTALL_FULL_LIBDIR@) + set (FFTW3@PREC_SUFFIX@_INCLUDE_DIRS @CMAKE_INSTALL_FULL_INCLUDEDIR@) + +-include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3LibraryDepends.cmake") ++include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3LibraryDepends.cmake" OPTIONAL) + + if (CMAKE_VERSION VERSION_LESS 2.8.3) + set (CMAKE_CURRENT_LIST_DIR) +
